Skip to content

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

weiznich and others added 8 commits January 16, 2026 13:39
This PR adds an additional help note to the ambiguity lint error output
to ask users updating their dependencies. This hopefully helps with
cases like rust-lang#149845 where newer crate versions are fixed.
Closing brackets were missing on AdtDef, the field_types list in FruInfo, and InlineAsmExpr, breaking folding in some editors;
Fields were incorrectly (?) indexed in the list for functional update syntax, showing the (implicit, irrelevant) iteration index instead of the field index;
also spurious colon after Pat.
Ship LLVM (`rust-dev`) in fast try builds again

rust-lang#142963 stopped shipping `rust-dev` in fast try builds, which was not actually correct, because if a PR modifies the LLVM submodule, we should provide the prebuilt LLVM for rustc-perf even in a (fast) try build. So why didn't we find out about this earlier? Well, because soon before that PR landed, we started using new bors for try builds, which actually broke bootstrap's git change detection logic, because new bors used a different e-mail address for merge commits.

So the two bugs kind of masked each other out. Recently, we fixed the e-mail address and git change detection with new bors, since it's now also used for auto builds, but that in turn broke fast try builds that modify LLVM (rust-lang#150722 (comment)), because rustc-perf saw that LLVM was modified in the try build, and it (correctly!) tried to download `rust-dev` for the given try build commit, but that was (incorrectly!) missing on CI, due to being skipped.

This PR restored building the `rust-dev` component in fast try builds. In theory, we could use the same git detection logic that bootstrap uses and only do this if LLVM is actually modified in the given commit, but I'd rather do the correct thing here, than introduce additional opportunities for the git detection to desync.
Add an additional help note to the ambiguity lint error

This PR adds an additional help note to the ambiguity lint error output to ask users updating their dependencies. This hopefully helps with cases like rust-lang#149845 where newer crate versions are fixed.

r? @petrochenkov
…-names, r=bjorn3

Add missing closing brackets to THIR output.

Closing brackets were missing on AdtDef, the field_types list in FruInfo, and InlineAsmExpr, breaking folding in some editors; Fields were incorrectly (?) indexed in the list for functional update syntax, showing the (implicit, irrelevant) iteration index instead of the field index; also spurious colon after Pat.
compiletest: Add `AuxCrate` struct with docs.

To make the code clearer.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 16, 2026
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 16, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 16, 2026

📌 Commit 2c2b622 has been approved by matthiaskrgr

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 Jan 16, 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 Jan 16, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 16, 2026

☀️ Test successful - CI
Approved by: matthiaskrgr
Pushing f6a07ef to main...

@rust-bors rust-bors bot merged commit f6a07ef into rust-lang:main Jan 16, 2026
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 16, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151196 Ship LLVM (rust-dev) in fast try builds again 806e16cd374a8f487c396bb06349a0d853e23b4c (link)
#151198 Add an additional help note to the ambiguity lint error 815725a582b07cdc76043a45e094003dee6b3a70 (link)
#151215 Add missing closing brackets to THIR output. 13bf99510cb4124ce524dfe657e1f47f590c7e0d (link)
#151218 compiletest: Add AuxCrate struct with docs. b119b413284f79da75586d1dd3f6c746e2025c5e (link)

previous master: 503745e917

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
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 503745e (parent) -> f6a07ef (this PR)

Test differences

Show 22 test diffs

Stage 1

  • [ui] tests/ui/thir-print/thir-tree-field-expr-index.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/thir-print/thir-tree-field-expr-index.rs: [missing] -> pass (J1)

Additionally, 20 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 f6a07efc81e4b5a9166884f50c2cb1686009c3fd --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-x86_64-apple: 9978.4s -> 6141.4s (-38.5%)
  2. aarch64-apple: 12543.0s -> 8156.0s (-35.0%)
  3. dist-aarch64-linux: 8796.1s -> 6218.2s (-29.3%)
  4. dist-apple-various: 4478.5s -> 3281.3s (-26.7%)
  5. dist-aarch64-apple: 9444.5s -> 7523.2s (-20.3%)
  6. pr-check-1: 1975.6s -> 1667.8s (-15.6%)
  7. x86_64-rust-for-linux: 3193.2s -> 2763.1s (-13.5%)
  8. i686-gnu-2: 6051.4s -> 5237.5s (-13.5%)
  9. x86_64-msvc-ext1: 7295.3s -> 8158.5s (+11.8%)
  10. i686-gnu-nopt-1: 8362.9s -> 7405.0s (-11.5%)
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 (f6a07ef): 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 -2.6%)

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)
-2.6% [-3.1%, -2.2%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.6% [-3.1%, -2.2%] 2

Cycles

Results (primary 2.0%)

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

mean range count
Regressions ❌
(primary)
2.0% [1.5%, 2.4%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [1.5%, 2.4%] 2

Binary size

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

Bootstrap: 473.941s -> 472.76s (-0.25%)
Artifact size: 383.50 MiB -> 383.52 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants