Skip to content

Update cargo submodule#156623

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
weihanglo:update-cargo
May 17, 2026
Merged

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

Conversation

@weihanglo
Copy link
Copy Markdown
Member

@weihanglo weihanglo commented May 15, 2026

View all comments

7 commits in a343accce8526b128adc517d33348573d22920a3..4d1f984518c77fad6eeef4f40153b002a659e662
2026-05-08 22:41:35 +0000 to 2026-05-15 17:12:01 +0000

r? ghost

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 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 May 15, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 15, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

📌 Commit 7ad60b6 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-review Status: Awaiting review from the assignee but also interested parties. labels May 16, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 16, 2026
Update cargo submodule

7 commits in a343accce8526b128adc517d33348573d22920a3..4d1f984518c77fad6eeef4f40153b002a659e662
2026-05-08 22:41:35 +0000 to 2026-05-15 17:12:01 +0000
- Revert "feat: add frame-pointers profile option (rust-lang/cargo#16742)" (rust-lang/cargo#16999)
- CI: update to macos-15 (rust-lang/cargo#16996)
- fix(clean): respect `build.target` config for `clean -p` (rust-lang/cargo#16988)
- fix(diag): Consolidate verify/run diagnostics passes  (rust-lang/cargo#16989)
- fix(diag): Track Cargo diagnostic warning/error count like is done for rustc (rust-lang/cargo#16981)
- fix: suggest 'fmt' when user types 'cargo rustfmt' (rust-lang/cargo#16985)
- Rebuild when -Zpublic-dependency changes (rust-lang/cargo#16965)

r? ghost
@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 May 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

💔 Test for 8507b8c failed: CI. Failed job:

@rust-log-analyzer
Copy link
Copy Markdown
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)
#13 DONE 23.8s

#14 [ 6/25] RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
#14 0.162 Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8)).
#14 0.179 Executing: /tmp/apt-key-gpghome.ZTEZpPfKlx/gpg.1.sh --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
#14 1.042 gpg: key 74DA7924C5513486: public key "Igor Kozhukhov <igor@dilos.org>" imported
#14 1.046 gpg: Total number processed: 1
#14 1.046 gpg:               imported: 1
#14 DONE 1.1s

@weihanglo
Copy link
Copy Markdown
Member Author

@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. 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-review Status: Awaiting review from the assignee but also interested parties. labels May 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

This pull request was unapproved.

@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 May 16, 2026
@weihanglo
Copy link
Copy Markdown
Member Author

@bors retry

Spurious failure fixed by #156640.

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

❗ You can only retry pull requests that are approved and have a previously failed auto build.

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented May 16, 2026

@weihanglo You'll need to cherry-pick the fix from #156640 to allow the image to work on this branch. Can you include that here?

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented May 16, 2026

Oops, sorry, I posted on the wrong PR. I meant for the beta one... Nevermind!

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented May 16, 2026

@bors r+

I have no idea why bors said there is a merge conflict. GitHub does not claim that, and nothing has touched the submodule.

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 16, 2026

📌 Commit 7ad60b6 has been approved by ehuss

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 May 16, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 16, 2026
Update cargo submodule

7 commits in a343accce8526b128adc517d33348573d22920a3..4d1f984518c77fad6eeef4f40153b002a659e662
2026-05-08 22:41:35 +0000 to 2026-05-15 17:12:01 +0000
- Revert "feat: add frame-pointers profile option (rust-lang/cargo#16742)" (rust-lang/cargo#16999)
- CI: update to macos-15 (rust-lang/cargo#16996)
- fix(clean): respect `build.target` config for `clean -p` (rust-lang/cargo#16988)
- fix(diag): Consolidate verify/run diagnostics passes  (rust-lang/cargo#16989)
- fix(diag): Track Cargo diagnostic warning/error count like is done for rustc (rust-lang/cargo#16981)
- fix: suggest 'fmt' when user types 'cargo rustfmt' (rust-lang/cargo#16985)
- Rebuild when -Zpublic-dependency changes (rust-lang/cargo#16965)

r? ghost
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test expr_store::scope::tests::test_resolve_local_name_shadow ... ok
test expr_store::scope::tests::test_shadow_variable ... ok
test expr_store::tests::body::array_element_cfg ... ok
test expr_store::tests::body::async_fn_weird_param_patterns ... ok
error: test failed, to rerun pass `-p hir-def --lib`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/hir_def-f381e8bd2208ec8b '--skip=tests::smoke_test_real_sysroot_cargo' --skip=check_code_formatting -Z unstable-options --format json` (signal: 11, SIGSEGV: invalid memory reference)
Bootstrap failed while executing `--stage 2 test --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Build completed unsuccessfully in 1:07:15
  local time: Sun May 17 00:12:09 UTC 2026
  network time: Sun, 17 May 2026 00:12:09 GMT
##[error]Process completed with exit code 1.

@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 May 17, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 17, 2026

💔 Test for 3f417ca failed: CI. Failed job:

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented May 17, 2026

@bors retry

#156460, rust-analyzer hir-def test failure.

@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 May 17, 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 May 17, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 17, 2026

☀️ Test successful - CI
Approved by: ehuss
Duration: 3h 17m 30s
Pushing ba0949a to main...

@rust-bors rust-bors Bot merged commit ba0949a into rust-lang:main May 17, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 17, 2026
@github-actions
Copy link
Copy Markdown
Contributor

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 281c97c (parent) -> ba0949a (this PR)

Test differences

Show 12 test diffs

Stage 2

  • cargo_command::cargo_rustfmt_suggestion: [missing] -> pass (J0)
  • clean::clean_p_respects_build_target_config: [missing] -> pass (J0)
  • profiles::frame_pointers_default_overrides_parent: pass -> [missing] (J0)
  • profiles::frame_pointers_force_off: pass -> [missing] (J0)
  • profiles::frame_pointers_force_on: pass -> [missing] (J0)
  • profiles::frame_pointers_invalid_value: pass -> [missing] (J0)
  • profiles::frame_pointers_unspecified: pass -> [missing] (J0)
  • pub_priv::z_public_dependency_invalidates_fingerprint: [missing] -> ignore (exported_private_dependencies lint is unstable) (J0)

Additionally, 4 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 ba0949ab745985a442e274ba52e8fb348cb0c662 --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. dist-i686-mingw: 2h 11m -> 2h 54m (+32.4%)
  2. dist-i686-msvc: 1h 54m -> 2h 23m (+25.5%)
  3. i686-gnu-1: 2h 17m -> 1h 43m (-24.6%)
  4. dist-x86_64-mingw: 2h 6m -> 2h 36m (+23.9%)
  5. dist-arm-linux-gnueabi: 1h 13m -> 1h 30m (+23.6%)
  6. x86_64-gnu-llvm-21-3: 1h 55m -> 1h 29m (-21.9%)
  7. optional-x86_64-gnu-parallel-frontend: 2h 48m -> 2h 15m (-20.0%)
  8. dist-x86_64-apple: 1h 44m -> 2h 3m (+18.5%)
  9. pr-check-1: 33m 2s -> 27m 25s (-17.0%)
  10. armhf-gnu: 1h 11m -> 1h 22m (+15.3%)
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
Copy Markdown
Collaborator

Finished benchmarking commit (ba0949a): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
0.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 1

Max RSS (memory usage)

Results (primary 5.0%)

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

mean range count
Regressions ❌
(primary)
5.0% [4.1%, 5.9%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 5.0% [4.1%, 5.9%] 3

Cycles

Results (primary -2.0%, secondary 0.3%)

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)
3.3% [3.3%, 3.3%] 1
Improvements ✅
(primary)
-2.0% [-2.0%, -2.0%] 1
Improvements ✅
(secondary)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) -2.0% [-2.0%, -2.0%] 1

Binary size

Results (primary 0.2%, 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.2% [0.0%, 0.4%] 11
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.1%] 5
All ❌✅ (primary) 0.2% [0.0%, 0.4%] 11

Bootstrap: 513.22s -> 511.658s (-0.30%)
Artifact size: 400.48 MiB -> 398.51 MiB (-0.49%)

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.

5 participants