Skip to content

Update cargo submodule#153429

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo
Mar 6, 2026
Merged

Update cargo submodule#153429
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo

Conversation

@weihanglo
Copy link
Member

@weihanglo weihanglo commented Mar 5, 2026

View all comments

12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000

@weihanglo weihanglo self-assigned this Mar 5, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 5, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 5, 2026

📌 Commit faa320d has been approved by weihanglo

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 5, 2026
Update cargo submodule

11 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..708100e0d0fe64ad66e05dc5a19110936a5ca4b1
2026-02-24 21:59:20 +0000 to 2026-03-05 02:03:19 +0000
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
@rust-bors rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 5, 2026

💔 Test for 5d73c52 failed: CI. Failed job:

@JonathanBrouwer
Copy link
Contributor

@bors retry
Spurious

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2026
@JonathanBrouwer
Copy link
Contributor

@bors p=6
Running this before the next rollup

@rust-log-analyzer

This comment has been minimized.

@weihanglo
Copy link
Member Author

@bors r-

I'll include rust-lang/cargo#16706 and resume

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2026
@weihanglo
Copy link
Member Author

@bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 5, 2026

📌 Commit c32e1f3 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 5, 2026
Update cargo submodule

12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
@rust-bors rust-bors bot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 5, 2026
@rust-bors rust-bors bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 5, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 5, 2026

💔 Test for 6dca348 failed: CI

@JonathanBrouwer
Copy link
Contributor

Huh I have no clue what happened here, I don't see any actually failed jobs
@bors retry

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2026
@JonathanBrouwer
Copy link
Contributor

@bors p=1

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 5, 2026
Update cargo submodule

12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)
@Zalathar
Copy link
Member

Zalathar commented Mar 6, 2026

Several jobs have failed, but the workflow is still running for some reason.

@bors r-

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 6, 2026

Commit c32e1f3 has been unapproved.

Auto build cancelled due to unapproval. Cancelled workflows:

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@Zalathar
Copy link
Member

Zalathar commented Mar 6, 2026

@bors r=weihanglo

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 6, 2026

📌 Commit c32e1f3 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 6, 2026

☀️ Test successful - CI
Approved by: weihanglo
Duration: 4h 5m 18s
Pushing f824853 to main...

@rust-bors rust-bors bot merged commit f824853 into rust-lang:main Mar 6, 2026
11 of 12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 6, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 69370dc (parent) -> f824853 (this PR)

Test differences

Show 9 test diffs

Stage 2

  • edition::future_edition_with_rust_version_hint: [missing] -> pass (J0)
  • fix::script_with_edition: [missing] -> ignore (-Zscript is unstable) (J0)
  • fix::script_with_frontmatter: [missing] -> ignore (-Zscript is unstable) (J0)
  • fix::script_with_package_dotted: [missing] -> ignore (-Zscript is unstable) (J0)
  • fix::script_with_package_table: [missing] -> ignore (-Zscript is unstable) (J0)
  • fix::script_without_frontmatter: [missing] -> ignore (-Zscript is unstable) (J0)
  • workspaces::parent_manifest_error_mentions_workspace_search: [missing] -> pass (J0)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard f82485388963286763f8c8a9261ac227627f6a18 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. i686-gnu-2: 1h 41m -> 1h 25m (-16.0%)
  2. aarch64-apple: 3h 25m -> 3h 58m (+15.6%)
  3. aarch64-gnu-debug: 1h 15m -> 1h 4m (-14.4%)
  4. x86_64-rust-for-linux: 54m 17s -> 46m 38s (-14.1%)
  5. x86_64-gnu-llvm-21-3: 1h 42m -> 1h 54m (+11.6%)
  6. x86_64-msvc-2: 2h 13m -> 2h 29m (+11.5%)
  7. dist-apple-various: 1h 49m -> 2h 1m (+11.4%)
  8. x86_64-gnu-llvm-21-1: 1h 9m -> 1h 2m (-10.9%)
  9. i686-gnu-nopt-1: 2h 23m -> 2h 8m (-10.8%)
  10. x86_64-gnu-llvm-21-2: 1h 34m -> 1h 24m (-10.6%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f824853): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 0.8%, secondary 1.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.9% [0.5%, 3.5%] 9
Regressions ❌
(secondary)
2.5% [0.5%, 4.4%] 6
Improvements ✅
(primary)
-2.6% [-3.0%, -2.1%] 3
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) 0.8% [-3.0%, 3.5%] 12

Cycles

Results (primary 2.3%, secondary -2.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-2.6%, -2.4%] 2
All ❌✅ (primary) 2.3% [2.3%, 2.3%] 1

Binary size

Results (primary -0.1%, secondary -0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.0%] 14
Improvements ✅
(secondary)
-0.1% [-0.2%, -0.0%] 16
All ❌✅ (primary) -0.1% [-0.1%, -0.0%] 14

Bootstrap: 482.035s -> 480.442s (-0.33%)
Artifact size: 397.04 MiB -> 397.10 MiB (0.01%)

@weihanglo weihanglo deleted the update-cargo branch March 6, 2026 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants