Skip to content

Rollup of 5 pull requests - #147186

Merged
bors merged 16 commits into
rust-lang:masterfrom
Zalathar:rollup-sza9wxl
Sep 30, 2025
Merged

Rollup of 5 pull requests#147186
bors merged 16 commits into
rust-lang:masterfrom
Zalathar:rollup-sza9wxl

Conversation

@Zalathar

@ZalatharZalathar commented Sep 30, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdevand others added 16 commits September 16, 2025 20:30
```
error[E0597]: `c` does not live long enough
--> $DIR/without-precise-captures-we-are-powerless.rs:19:20
|
LL | fn simple<'a>(x: &'a i32) {
| -- lifetime `'a` defined here
...
LL | let c = async move || { println!("{}", *x); };
| - binding `c` declared here
LL | outlives::<'a>(c());
| ---------------^---
| | |
| | borrowed value does not live long enough
| argument requires that `c` is borrowed for `'a`
LL | outlives::<'a>(call_once(c));
LL | }
| - `c` dropped here while still borrowed
|
note: requirement that `c` is borrowed for `'a` introduced here
--> $DIR/without-precise-captures-we-are-powerless.rs:7:33
|
LL | fn outlives<'a>(_: impl Sized + 'a) {}
| ^^
```
When encountering a `ConstraintCategory::Predicate` in a funtion call, point at the `Span` for that `Predicate` to explain where the lifetime obligation originates from.
```
error[E0716]: temporary value dropped while borrowed
--> $DIR/multiple-sources-for-outlives-requirement.rs:5:38
|
LL | fn foo<'b>() {
| -- lifetime `'b` defined here
LL | outlives_indir::<'_, 'b, _>(&mut 1u32);
| ---------------------------------^^^^-- temporary value is freed at the end of this statement
| | |
| | creates a temporary value which is freed while still in use
| argument requires that borrow lasts for `'b`
|
note: requirements that the value outlives `'b` introduced here
--> $DIR/multiple-sources-for-outlives-requirement.rs:1:23
|
LL | fn outlives_indir<'a: 'b, 'b, T: 'a>(_x: T) {}
| ^^ ^^
```
In d94e7ff, `rustdoc_path` was changed
to ignore `want_rustdoc` (which is just whether `--no-doc` was passed).
But RUSTDOC_LIBDIR wasn't kept in sync. Rather than trying to keep
`rustdoc_path` in sync with `RUSTDOC_LIBDIR`, just pass LIBDIR to the
rustc shim unconditionally.
This fix allows calling `ensure(doc::Step)` from a non-doc top-level
Step, even if `--no-doc` was present in the command line.
Fix unuseful span in type error in some format_args!() invocations
Fixedrust-lang#140578.
r? ``@m-ou-se``
… r=lcnr
Point at fn bound that introduced lifetime obligation
The last note is new
```
error[E0597]: `c` does not live long enough
--> $DIR/without-precise-captures-we-are-powerless.rs:19:20
|
LL | fn simple<'a>(x: &'a i32) {
| -- lifetime `'a` defined here
...
LL | let c = async move || { println!("{}", *x); };
| - binding `c` declared here
LL | outlives::<'a>(c());
| ---------------^---
| | |
| | borrowed value does not live long enough
| argument requires that `c` is borrowed for `'a`
LL | outlives::<'a>(call_once(c));
LL | }
| - `c` dropped here while still borrowed
|
note: requirement that `c` is borrowed for `'a` introduced here
--> $DIR/without-precise-captures-we-are-powerless.rs:7:33
|
LL | fn outlives<'a>(_: impl Sized + 'a) {}
| ^^
```
When encountering a `ConstraintCategory::Predicate` in a funtion call, point at the `Span` for that `Predicate` to explain where the lifetime obligation originates from.
CC rust-lang#55307.
…, r=lcnr
cmse: fix 'region variables should not be hashed'
tracking issue: rust-lang#81391fixesrust-lang#131639
Some background: the `cmse-nonsecure-call` calling convention is used for a call from "secure" to "non-secure" code. To make sure that "non-secure" cannot read any secrets, restrictions are put on the signatures of functions with this calling convention: they can only use 4 arguments for passing arguments, and one register for passing a result. No arguments are passed via the stack, and all other registers are cleared before the call.
We check during `hir_ty_lowering` that the signature follows these rules. We do that by determining and then inspecting the layout of the type. That works well overall, but can run into asserts when the type itself is ill-formed. This PR fixes one such case.
I believe that the fix here, just erasing the regions, is the right shape, but there may be some nuance that I'm missing.
r? types
…=lcnr
Rename various "concrete opaque type" things to say "hidden type"
r? lcnr
I've found "concrete opaque type" terminology to be somewhat confusing as in conversation and when explaining opaque type stuff to people I always just talk about things in terms of hidden types. Also the hidden types of opaques are very much not *concrete* in the same sense that a type without any generic parameters is concrete which is an unfortunate overlap in terminology.
I've tried to update comments to also stop referring to things as concrete opaque types but this is mostly best effort as it difficult to find all such cases amongst the massive amounts of uses of "concrete" or "hidden" across the whole compiler.
Don't condition RUSTDOC_LIBDIR on `--no-doc`
In d94e7ff, `rustdoc_path` was changed to ignore `want_rustdoc` (which is just whether `--no-doc` was passed). But RUSTDOC_LIBDIR wasn't kept in sync. Rather than trying to keep `rustdoc_path` in sync with `RUSTDOC_LIBDIR`, just pass LIBDIR to the rustc shim unconditionally.
This fix allows calling `ensure(doc::Step)` from a non-doc top-level Step, even if `--no-doc` was present in the command line.
@rustbotrustbot added 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. rollup A PR which is a rollup labels Sep 30, 2025
@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rollup of everything not in #147175.

@bors r+ rollup=never p=5

@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 2264303 has been approved by Zalathar

It is now in the queue for this repository.

@borsbors 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 Sep 30, 2025
@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2264303 with merge 42d009c...

@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 42d009c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2025
@bors
bors merged commit 42d009c into rust-lang:masterSep 30, 2025
11 checks passed
@rustbotrustbot added this to the 1.92.0 milestone Sep 30, 2025
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#140916Fix unuseful span in type error in some format_args!() invo…90586160e26d69f4736bfc5192321388bbeb6c84 (link)
#146011Point at fn bound that introduced lifetime obligation5f51ddb57cad407c7dbcbdf6e1f11bc13bc3763a (link)
#146649cmse: fix 'region variables should not be hashed'6891790c671a4dd75538d26fcc787b2fe9926a01 (link)
#147109Rename various "concrete opaque type" things to say "hidden…e4b6e6e802638aed965845408dbd90aba2782339 (link)
#147167Don't condition RUSTDOC_LIBDIR on --no-doc85f5ce351dbe9051424e40583023396662d1f130 (link)

previous master: a2db928053

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
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 a2db928 (parent) -> 42d009c (this PR)

Test differences

Show 19 test diffs

Stage 1

  • [ui] tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs: [missing] -> pass (J1)
  • [ui] tests/ui/errors/span-format_args-issue-140578.rs: [missing] -> pass (J1)
  • [ui] tests/ui/regions/multiple-sources-for-outlives-requirement.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs: [missing] -> pass (J0)
  • [ui] tests/ui/errors/span-format_args-issue-140578.rs: [missing] -> pass (J0)
  • [ui] tests/ui/regions/multiple-sources-for-outlives-requirement.rs: [missing] -> pass (J0)

Additionally, 13 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 42d009c0a9be0f7020a03f85dd47faa00d6d7bdf --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-aarch64-linux: 8391.1s -> 6471.0s (-22.9%)
  2. x86_64-rust-for-linux: 2502.5s -> 3035.0s (21.3%)
  3. aarch64-apple: 8108.8s -> 9724.7s (19.9%)
  4. x86_64-gnu-llvm-20-2: 5436.1s -> 6378.9s (17.3%)
  5. aarch64-gnu-llvm-20-1: 3324.3s -> 3743.5s (12.6%)
  6. dist-aarch64-apple: 7297.3s -> 8198.8s (12.4%)
  7. i686-gnu-2: 5252.2s -> 5895.7s (12.3%)
  8. dist-various-1: 4391.2s -> 3940.8s (-10.3%)
  9. x86_64-gnu-llvm-20: 2465.2s -> 2715.2s (10.1%)
  10. test-various: 4438.1s -> 4885.7s (10.1%)
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 (42d009c): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

meanrangecount
Regressions ❌
(primary)
3.0%[3.0%, 3.0%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)3.0%[3.0%, 3.0%]1

Max RSS (memory usage)

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

Cycles

Results (primary 0.6%, secondary 3.3%)

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

meanrangecount
Regressions ❌
(primary)
3.4%[3.4%, 3.4%]1
Regressions ❌
(secondary)
3.3%[3.3%, 3.3%]1
Improvements ✅
(primary)
-2.2%[-2.2%, -2.2%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)0.6%[-2.2%, 3.4%]2

Binary size

Results (primary 1.1%)

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

meanrangecount
Regressions ❌
(primary)
1.1%[1.1%, 1.1%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)1.1%[1.1%, 1.1%]1

Bootstrap: 470.437s -> 472.044s (0.34%)
Artifact size: 387.69 MiB -> 387.71 MiB (0.01%)

@rustbotrustbot added the perf-regression Performance regression. label Sep 30, 2025
@lqd

lqd commented Sep 30, 2025

Copy link
Copy Markdown
Member

This looks like the common clap_derive opt noise to me.

@Zalathar
Zalathar deleted the rollup-sza9wxl branch October 1, 2025 01:45
@panstromek

Copy link
Copy Markdown
Contributor

perf triage:

clap_derive bimodal noise

@rustbot label: +perf-regression-triaged

@rustbotrustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 6, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.perf-regression-triagedThe performance regression has been triaged.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant 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.

11 participants

@Zalathar@bors@rust-timer@lqd@panstromek@rustbot@folkertdev@BoxyUwU@estebank@jyn514@moatom