Update cargo submodule - #159857
Conversation
|
Some changes occurred in src/tools/cargo cc @ehuss |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Need to update those rmake tests to reflect nightly build-dir layout changes. |
|
The run-make-support library was changed cc @jieyouxu |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
r? ranger-ross Mind reviewing 86a4c65 is good? |
|
| let file_name = path.file_name().unwrap().to_str().unwrap(); | ||
| file_name.starts_with("libcompiler_builtins") && file_name.ends_with(".rlib") | ||
| }); | ||
| assert_eq!(rlibs.len(), 1, "expected exactly one compiler_builtins rlib: {rlibs:?}"); |
There was a problem hiding this comment.
length assertion should guard us well to only get the one and only artifact.
|
Or @jieyouxu if you are willing to take a look at the rmake change? 🥺 |
| .unwrap(); | ||
| // The rlib file is emitted as an intermediate build artifacts. | ||
| // Do not hardcode the path. | ||
| let mut rlibs = recursive_find_files(&target_dir, |path| { |
There was a problem hiding this comment.
should we change this to target_dir.join("debug")?
If it's built in release mode we could end up finding the debug and release .rlibs and hit the assert below.
Not sure if that is applicable for run-make tests
|
Okay. Going to merge this. @bors r=ranger-ross p=1 rollup=never If the remake test changes are bad, please call them out! |
No they look fine, cheers |
Update cargo submodule try-job: x86_64-gnu-aux
Cargo enables build-dir layout v2 by default on nightly (rust-lang/cargo PR 17258). Intermediate build artifacts no longer live in `<target-dir>/<triple>/<profile>/deps/` but in per-unit `build/<pkg>/<hash>/out/` directories.
`xsv` locates binaries relative to `current_exe()`, which assumes Cargo's legacy build-dir layout: https://triage.rust-lang.org/gha-logs/rust-lang/rust/90658568103 We should revisit and replace xsv to something else with similar portfolio
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
|
@bors r=ranger-ross |
This comment has been minimized.
This comment has been minimized.
Update cargo submodule ## src/tools/cargo 23 commits in 3efb1f477e99b42974b982d939fd100303cdf7db..7c83d4cc0953b81d823e47d640c64da9b8bd4fac 2026-07-17 23:53:19 +0000 to 2026-07-29 21:34:53 +0000 - fix: Pass rustdoc flags to final CCI merge step (rust-lang/cargo#17269) - Reworked how we enable the new build-dir layout on nightly (rust-lang/cargo#17272) - Allow setting `-Zembed-metadata` value from the config (rust-lang/cargo#17266) - fix(cli): don't panic during completions when rustup is unavailable (rust-lang/cargo#17263) - docs(workspace): add recommended structure to members field (rust-lang/cargo#17166) - Update cargo-fetch.md to remove cargo-prefetch reference (rust-lang/cargo#16568) - chore: bump to `libgit2-sys@0.18.7+1.9.6` (rust-lang/cargo#17259) - Enable build-dir layout v2 on nightly by default (rust-lang/cargo#17258) - fix(path): clarify error message when path dependency has wrong package (rust-lang/cargo#16927) - fix(toml): warn on hyphenated lint names and duplicates (rust-lang/cargo#17051) - fix(test): gate trim-paths tests on split debuginfo support (rust-lang/cargo#17256) - test(git): Explicitly test for git injection attacks (rust-lang/cargo#17253) - fix(git): Suggest libgit2 if git-cli fails (rust-lang/cargo#17252) - fix(diag): bound transitive unused dependency traversal (rust-lang/cargo#17251) - fix(git): Hide git fetch output without progress (rust-lang/cargo#17243) - revert(lint): Remove `new_implicit_minimum_version_req` (rust-lang/cargo#16321) (rust-lang/cargo#17249) - fix: Add haiku's dylib path (rust-lang/cargo#17248) - Zsh completion: Add `-p` and `--package` flags for `cargo add` (rust-lang/cargo#17247) - refactor(source): Clarify the name of the remote git registry (rust-lang/cargo#17240) - fix(timings): only report units the job queue actually ran (rust-lang/cargo#17238) - Do not include proc-macro deps in rustc search path args (rust-lang/cargo#17236) - chore(deps): update cargo-semver-checks to v0.49.0 (rust-lang/cargo#17237) - rustdoc: rename the doc parts metadata params (rust-lang/cargo#17234) ## src/tools/rustc-perf 12 commits in 0508bdcd37152b28c39b6752828683cdd3f128b5..74ecbcdf88411937a6e39baf2779948565dfd388 2026-07-15 10:20:27 +0000 to 2026-07-27 15:02:48 +0000 - feat: support `@argfile` for rustc-fake (rust-lang/rustc-perf#2509) - Download Clippy when a Clippy profile is requested (rust-lang/rustc-perf#2508) - Add early check for missing rustdoc/clippy in a toolchain (rust-lang/rustc-perf#2507) - Add 2026-07-21 triage (rust-lang/rustc-perf#2506) - use stable extract_if: since 1.87 (rust-lang/rustc-perf#2191) - Update GitHub Actions (rust-lang/rustc-perf#2460) - Update dependency @types/msgpack-lite to v0.1.12 (rust-lang/rustc-perf#2439) - Add 30 day history link to artifact size tab on the compare page (rust-lang/rustc-perf#2505) - Fix selecting color for the bootstrap chart on the toolchain page (rust-lang/rustc-perf#2504) - Add artifact size history chart to toolchain page (rust-lang/rustc-perf#2501) - Parallel frontend compiler support (perf backend only) (rust-lang/rustc-perf#2491) - Run benchmark smoke test for all profiles on Windows on CI (rust-lang/rustc-perf#2503)
|
💔 Test for fbad33a failed: CI. Failed job:
|
|
https://triage.rust-lang.org/gha-logs/rust-lang/rust/90741182399#L2026-07-30T00:01:07.3175372Z Unrelated failure. @bors retry |
This comment was marked as outdated.
This comment was marked as outdated.
This comment has been minimized.
This comment has been minimized.
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 1a833e1 (parent) -> 83709ee (this PR) Test differencesShow 47 test diffsStage 2
Additionally, 4 doctest diffs were found. These are ignored, as they are noisy. Job group index Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 83709eedfff36840b0749ca429ac43f5479b268f --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (83709ee): comparison URL. Overall result: ❌✅ regressions and improvements - please read:Our benchmarks found a performance regression caused by this PR. Next Steps:
@rustbot label: +perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 1.1%, secondary 0.7%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 0.6%, secondary 9.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis perf run didn't have relevant results for this metric. Bootstrap: 497.309s -> 491.471s (-1.17%) |
|
The big regression on #158823 should improve the performance here considerably. @rustbot label: +perf-regression-triaged |
View all comments
src/tools/cargo
23 commits in 3efb1f477e99b42974b982d939fd100303cdf7db..7c83d4cc0953b81d823e47d640c64da9b8bd4fac
2026-07-17 23:53:19 +0000 to 2026-07-29 21:34:53 +0000
-Zembed-metadatavalue from the config (Allow setting-Zembed-metadatavalue from the config cargo#17266)libgit2-sys@0.18.7+1.9.6(chore: bump tolibgit2-sys@0.18.7+1.9.6cargo#17259)new_implicit_minimum_version_req(feat(lint): newimplicit_minimum_version_reqlint cargo#16321) (revert(lint): Removenew_implicit_minimum_version_req(#16321) cargo#17249)-pand--packageflags forcargo add(Zsh completion: Add-pand--packageflags forcargo addcargo#17247)src/tools/rustc-perf
12 commits in 0508bdcd37152b28c39b6752828683cdd3f128b5..74ecbcdf88411937a6e39baf2779948565dfd388
2026-07-15 10:20:27 +0000 to 2026-07-27 15:02:48 +0000
@argfilefor rustc-fake (feat: support@argfilefor rustc-fake rustc-perf#2509)