Skip to content

Commit 193e13b

Browse files
KobzolKobzol
authored
Merge pull request #2071 from Kobzol/benchmark-update-2025-cargo
Update cargo to 0.87.1
2 parents 7801fd1 + 1c5c55f commit 193e13b

File tree

1,461 files changed

+344107
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,461 files changed

+344107
-4
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ jobs:
114114
#
115115
# We want the four parts to have similar runtimes.
116116
BENCH_INCLUDE_EXCLUDE_OPTS: [
117-
"--include cargo-0.60.0,stm32f4-0.14.0,webrender-2022",
118-
"--exclude cargo-0.60.0,stm32f4-0.14.0,webrender-2022",
117+
"--include cargo-0.60.0,cargo-0.87.1,stm32f4-0.14.0,webrender-2022",
118+
"--exclude cargo-0.60.0,cargo-0.87.1,stm32f4-0.14.0,webrender-2022",
119119
]
120120
PROFILES: [
121121
"Check,Debug,Doc",

‎collector/compile-benchmarks/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ They mostly consist of real-world crates.
2323
`N` value from 1 to 1024.
2424
- **cargo-0.60.0**: The Rust package manager. A large program, and an important
2525
part of the Rust ecosystem.
26+
- **cargo-0.87.1**: The Rust package manager. A large program, and an important
27+
part of the Rust ecosystem.
2628
- **clap-3.1.6**: A command line argument parser library. A crate used by many
2729
Rust programs.
2830
- **cranelift-codegen-0.82.1**: The largest crate from a code generator. Used by

‎collector/compile-benchmarks/REUSE.toml

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ path = "cargo-0.60.0/**"
3232
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
3333
SPDX-License-Identifier = "MIT OR Apache-2.0"
3434

35+
[[annotations]]
36+
path = "cargo-0.87.1/**"
37+
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
38+
SPDX-License-Identifier = "MIT OR Apache-2.0"
39+
3540
[[annotations]]
3641
path = "clap-3.1.6/**"
3742
SPDX-FileCopyrightText = "clap contributors"

‎collector/compile-benchmarks/cargo-0.87.1/.cargo/config.toml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[alias]
2+
build-man = "run --package xtask-build-man --"
3+
stale-label = "run --package xtask-stale-label --"
4+
bump-check = "run --package xtask-bump-check --"
5+
lint-docs = "run --package xtask-lint-docs --"
6+
7+
[env]
8+
# HACK: Until this is stabilized, `snapbox`s polyfill could get confused
9+
# inside of the rust-lang/rust repo because it looks for the furthest-away `Cargo.toml`
10+
CARGO_RUSTC_CURRENT_DIR = { value = "", relative = true }

‎collector/compile-benchmarks/cargo-0.87.1/.cargo_vcs_info.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"git": {
3+
"sha1": "ab9915ce5d9de5e1f2fb3c10378a353ca88693f2"
4+
},
5+
"path_in_vcs": ""
6+
}

‎collector/compile-benchmarks/cargo-0.87.1/.github/ISSUE_TEMPLATE/bug_report.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Bug Report
2+
description: Create a report to help us improve
3+
labels: ["C-bug", "S-triage"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: Thanks for filing a 🐛 bug report 😄!
8+
- type: textarea
9+
id: problem
10+
attributes:
11+
label: Problem
12+
description: >
13+
Please provide a clear and concise description of what the bug is,
14+
including what currently happens and what you expected to happen.
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: steps
19+
attributes:
20+
label: Steps
21+
description: Please list the steps to reproduce the bug.
22+
placeholder: |
23+
1.
24+
2.
25+
3.
26+
- type: textarea
27+
id: possible-solutions
28+
attributes:
29+
label: Possible Solution(s)
30+
description: >
31+
Not obligatory, but suggest a fix/reason for the bug,
32+
or ideas how to implement the addition or change.
33+
- type: textarea
34+
id: notes
35+
attributes:
36+
label: Notes
37+
description: Provide any additional notes that might be helpful.
38+
- type: textarea
39+
id: version
40+
attributes:
41+
label: Version
42+
description: Please paste the output of running `cargo version --verbose`.
43+
render: text

‎collector/compile-benchmarks/cargo-0.87.1/.github/ISSUE_TEMPLATE/config.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
contact_links:
2+
- name: Question
3+
url: https://users.rust-lang.org
4+
about: >
5+
Got a question about Cargo? Ask the community on the user forum.
6+
- name: Inspiring Idea
7+
url: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo
8+
about: >
9+
Need more discussions with your next big idea?
10+
Reach out the coummunity on the internals forum.

‎collector/compile-benchmarks/cargo-0.87.1/.github/ISSUE_TEMPLATE/feature_request.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Feature Request
2+
description: Suggest an idea for enhancing Cargo
3+
labels: ["C-feature-request", "S-triage"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for filing a 🙋 feature request 😄!
9+
10+
If the feature request is relatively small and already with a possible solution, this might be the place for you.
11+
12+
If you are brewing a big feature that needs feedback from the community, [the internal forum] is the best fit, especially for pre-RFC. You can also talk the idea over with other developers in [#t-cargo Zulip stream].
13+
14+
[the internal forum]: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo/15
15+
[#t-cargo Zulip stream]: https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo
16+
- type: textarea
17+
id: problem
18+
attributes:
19+
label: Problem
20+
description: >
21+
Please provide a clear description of your use case and the problem
22+
this feature request is trying to solve.
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: solution
27+
attributes:
28+
label: Proposed Solution
29+
description: >
30+
Please provide a clear and concise description of what you want to happen.
31+
- type: textarea
32+
id: notes
33+
attributes:
34+
label: Notes
35+
description: Provide any additional context or information that might be helpful.

‎collector/compile-benchmarks/cargo-0.87.1/.github/ISSUE_TEMPLATE/tracking_issue.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Tracking Issue
2+
description: A tracking issue for an accepted feature or RFC in Cargo.
3+
title: "Tracking Issue for _FEATURE_NAME_"
4+
labels: ["C-tracking-issue"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: >
9+
Thank you for creating a tracking issue! Tracking issues are for tracking an
10+
accepted feature or RFC from implementation to stabilization. Please do not
11+
file a tracking issue until the feature or RFC has been approved.
12+
- type: textarea
13+
id: summary
14+
attributes:
15+
label: Summary
16+
description: Please provide a very brief summary of the feature.
17+
value: |
18+
RFC: [#NNNN](https://github.com/rust-lang/rfcs/pull/NNNN) <!-- If this is an RFC -->
19+
Original issue: #NNNN <!-- if there is a related issue that spawned this feature -->
20+
Implementation: #NNNN <!-- link to the PR that implemented this feature if applicable -->
21+
Documentation: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#my-feature
22+
23+
Please enter a short, one-sentence description here.
24+
validations:
25+
required: true
26+
- type: textarea
27+
id: unresolved
28+
attributes:
29+
label: Unresolved Issues
30+
description: List issues that have not yet been resolved.
31+
placeholder: |
32+
* [ ] Make a list of any known implementation or design issues.
33+
- type: textarea
34+
id: future
35+
attributes:
36+
label: Future Extensions
37+
description: >
38+
An optional section where you can mention where the feature may be
39+
extended in the future, but is explicitly not intended to
40+
address.
41+
- type: textarea
42+
id: about
43+
attributes:
44+
label: About tracking issues
45+
description: Please include this notice in the issue.
46+
value: |
47+
Tracking issues are used to record the overall progress of implementation.
48+
They are also used as hubs connecting to other relevant issues, e.g., bugs or open design questions.
49+
A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
50+
Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.

‎collector/compile-benchmarks/cargo-0.87.1/.github/PULL_REQUEST_TEMPLATE.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<!--
2+
Thanks for submitting a pull request 🎉! Here are some tips for you:
3+
4+
* If this is your first contribution, read "Cargo Contribution Guide" first:
5+
https://doc.crates.io/contrib/
6+
* Run `cargo fmt --all` to format your code changes.
7+
* Small commits and pull requests are always preferable and easy to review.
8+
* If your idea is large and needs feedback from the community, read how:
9+
https://doc.crates.io/contrib/process/#working-on-large-features
10+
* Cargo takes care of compatibility. Read our design principles:
11+
https://doc.crates.io/contrib/design.html
12+
* When changing help text of cargo commands, follow the steps to generate docs:
13+
https://github.com/rust-lang/cargo/tree/master/src/doc#building-the-man-pages
14+
* If your PR is not finished, set it as "draft" PR or add "WIP" in its title.
15+
* It's ok to use the CI resources to test your PR, but please don't abuse them.
16+
17+
### What does this PR try to resolve?
18+
19+
Explain the motivation behind this change.
20+
A clear overview along with an in-depth explanation are helpful.
21+
22+
You can use `Fixes #<issue number>` to associate this PR to an existing issue.
23+
24+
### How should we test and review this PR?
25+
26+
Demonstrate how you test this change and guide reviewers through your PR.
27+
With a smooth review process, a pull request usually gets reviewed quicker.
28+
29+
If you don't know how to write and run your tests, please read the guide:
30+
https://doc.crates.io/contrib/tests
31+
32+
### Additional information
33+
34+
Other information you want to mention in this PR, such as prior arts,
35+
future extensions, an unresolved problem, or a TODO list.
36+
-->

‎collector/compile-benchmarks/cargo-0.87.1/.github/renovate.json5

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
schedule: [
3+
'before 5am on the first day of the month',
4+
],
5+
semanticCommits: 'enabled',
6+
configMigration: true,
7+
dependencyDashboard: true,
8+
ignorePaths: [
9+
'**/tests/**',
10+
],
11+
// See rust-lang/cargo#13546 and openssl/openssl#23376 for the exclusion
12+
ignoreDeps: ['openssl', 'openssl-src', 'openssl-sys'],
13+
customManagers: [
14+
{
15+
customType: 'regex',
16+
fileMatch: [
17+
'Cargo.toml$',
18+
],
19+
matchStrings: [
20+
'\\bMSRV:1\\b.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
21+
'(?<currentValue>\\d+\\.\\d+(\\.\\d+)?).*?\\bMSRV:1\\b',
22+
],
23+
depNameTemplate: 'MSRV:1', // Support 1 version of rustc
24+
packageNameTemplate: 'rust-lang/rust',
25+
datasourceTemplate: 'github-releases',
26+
},
27+
{
28+
customType: 'regex',
29+
fileMatch: [
30+
'Cargo.toml$',
31+
],
32+
matchStrings: [
33+
'\\bMSRV:3\\b.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
34+
'(?<currentValue>\\d+\\.\\d+(\\.\\d+)?).*?\\bMSRV:3\\b',
35+
],
36+
depNameTemplate: 'MSRV:3', // Support 3 versions of rustc
37+
packageNameTemplate: 'rust-lang/rust',
38+
datasourceTemplate: 'github-releases',
39+
},
40+
],
41+
packageRules: [
42+
{
43+
commitMessageTopic: 'MSRV (1 version)',
44+
matchManagers: [
45+
'custom.regex',
46+
],
47+
matchDepNames: [
48+
'MSRV:1',
49+
],
50+
extractVersion: '^(?<version>\\d+\\.\\d+)', // Drop the patch version
51+
schedule: [
52+
'* * * * *',
53+
],
54+
groupName: 'msrv',
55+
},
56+
{
57+
commitMessageTopic: 'MSRV (3 versions)',
58+
matchManagers: [
59+
'custom.regex',
60+
],
61+
matchDepNames: [
62+
'MSRV:3',
63+
],
64+
extractVersion: '^(?<version>\\d+\\.\\d+)', // Drop the patch version
65+
schedule: [
66+
'* * * * *',
67+
],
68+
minimumReleaseAge: '85 days', // 2 releases back * 6 weeks per release * 7 days per week + 1
69+
internalChecksFilter: 'strict',
70+
groupName: 'msrv',
71+
},
72+
// Goals:
73+
// - Rollup safe upgrades to reduce CI runner load
74+
// - Have lockfile and manifest in-sync (implicit rules)
75+
{
76+
matchManagers: [
77+
'cargo',
78+
],
79+
matchCurrentVersion: '>=0.1.0',
80+
matchUpdateTypes: [
81+
'patch',
82+
],
83+
automerge: false,
84+
groupName: 'compatible',
85+
},
86+
{
87+
matchManagers: [
88+
'cargo',
89+
],
90+
matchCurrentVersion: '>=1.0.0',
91+
matchUpdateTypes: [
92+
'minor',
93+
],
94+
automerge: false,
95+
groupName: 'compatible',
96+
},
97+
],
98+
}

‎collector/compile-benchmarks/cargo-0.87.1/.github/workflows/audit.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Security audit
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
pull_request:
8+
paths:
9+
- '**/Cargo.toml'
10+
- '**/Cargo.lock'
11+
push:
12+
branches:
13+
- master
14+
15+
jobs:
16+
cargo_deny:
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
checks:
21+
- advisories
22+
- bans licenses sources
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: EmbarkStudios/cargo-deny-action@v2
26+
# Prevent sudden announcement of a new advisory from failing ci:
27+
continue-on-error: ${{ matrix.checks == 'advisories' }}
28+
with:
29+
command: check ${{ matrix.checks }}
30+
rust-version: stable

0 commit comments

Comments
 (0)