Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 15, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

connortsui20 and others added 22 commits August 23, 2025 09:01
Previously, the local crate would always be printed as a leading `crate::`.
Allow resolving it to the crate name instead.

This allows printing a fully qualified path with:
```rust
let qualified_name = with_no_visible_paths!(with_resolve_crate_name!(
    with_no_trimmed_paths!(tcx.def_path_str(def_id))
));
```

I found this useful for an out-of-tree rustc-driver. I do not currently
have a usecase in mind upstream; I'm ok if you don't want this PR for
that reason.

This does not currently have tests. I am not aware of an easy way to
test def-id printing, since it requires having access to a TyCtxt.
Signed-off-by: zhetaicheleba <[email protected]>
Polonius liveness has to contain boring locals, and we ignore them in
diagnostics to match NLL diagnostics, since they doesn't contain boring locals.

We ignored these when explaining why a loan contained a point due to
a use of a live var, but not when it contained a point due to a drop of
a live var.
…grade, r=tgross35

Stabilize `rwlock_downgrade` library feature

Tracking Issue: rust-lang#128203

Method to be stabilized:

```rust
impl<'a, T: ?Sized> RwLockWriteGuard<'a, T> {
    pub fn downgrade(s: Self) -> RwLockReadGuard<'a, T> {}
}
```

~~I would like to point out that my documentation comment is longer than ideal, but at the same time I don't really know how else to show why `downgrade` is actually necessary (instead of just unlocking and relocking). If anyone has ideas for making this more concise that would be great!~~ I have made the documentation a bit more clear.

Stabilization report: rust-lang#128203 (comment)
…ethercote

Allow printing a fully-qualified path in `def_path_str`

Previously, the local crate would always be printed as a leading `crate::`. Allow resolving it to the crate name instead.

This allows printing a fully qualified path with:
```rust
let qualified_name = with_no_visible_paths!(with_resolve_crate_name!(
    with_no_trimmed_paths!(tcx.def_path_str(def_id))
));
```

I found this useful for an out-of-tree rustc-driver. I do not currently have a usecase in mind upstream; I'm ok if you don't want this PR for that reason. See [#t-compiler/help > print a fully qualified path name? @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/print.20a.20fully.20qualified.20path.20name.3F/near/541560961) for additional context.

This does not currently have tests. I am not aware of an easy way to test def-id printing, since it requires having access to a TyCtxt.
…, r=Kobzol

Update t-compiler beta nomination Zulip msg

Sister patch of [triagebot#2191](rust-lang/triagebot#2191)
Follow-up to rust-lang#147263

The triagebot now triggers a different message when a PR is nominated for backport, making it look like more a suggestion to evaluate for the author/reviewers than a mandatory decision for the team to take.

The wording (as per [triagebot#2191](rust-lang/triagebot#2191)) is open to suggestions.

Thanks
some `ErrorGuaranteed` cleanups

If we've got an `ErrorGuaranteed`, use it.
…r=GuillaumeGomez

Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes

r? `@GuillaumeGomez`
const `mem::drop`

I'm putting this under the `const Destruct` feature flag since it doesn't really feel relevant to put it elsewhere… it's just an empty function body, so, it doesn't have any particular weirdness attached to it (unlike `drop_in_place`, for example).

r? wg-const-eval
…s-async, r=jackh726

Fix ICE when using contracts on async functions

Fixes rust-lang#145333

contract is not supported for async functions right now, it's not properly lowered and getting HirId will ICE.

This PR adds checking for async function in expanding AST phase, it's better until we want to fully support async for contracts feature.
…nts, r=bjorn3

miri: use allocator_shim_contents codegen helper

r? `@bjorn3`

Follow-up to rust-lang#147526, also using that new infrastructure in Miri.
ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius

Polonius liveness has to contain boring locals, and we ignore them in diagnostics, to match NLL diagnostics that never involve any boring locals. When explaining why a borrow contains a point, I ignored these boring locals when it was due to a use of a live var, but forgot to do so when the cause was because of a drop of a live var.

This is what was causing the last two (known) diagnostics differences under the polonius compare-mode:
- `tests/ui/dropck/dropck_trait_cycle_checked.rs`
- `tests/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs`

r? `@jackh726`
…RalfJung

Revert unintentional whitespace changes to rustfmt-excluded file

Accidentally introduced in rust-lang#143548
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 15, 2025
@rustbot rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Oct 15, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 15, 2025

📌 Commit a4d2811 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors 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 Oct 15, 2025
@bors
Copy link
Collaborator

bors commented Oct 15, 2025

⌛ Testing commit a4d2811 with merge 402ce0e...

@bors
Copy link
Collaborator

bors commented Oct 16, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 402ce0e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 16, 2025
@bors bors merged commit 402ce0e into rust-lang:master Oct 16, 2025
12 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 16, 2025
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 57ef8d6 (parent) -> 402ce0e (this PR)

Test differences

Show 80 test diffs

Stage 1

  • [ui] tests/ui/contracts/async-fn-contract-ice-145333.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/contracts/async-fn-contract-ice-145333.rs: [missing] -> pass (J0)

Additionally, 78 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 402ce0ef07d5db9ba26ae5c37ce6aff0c9002052 --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. aarch64-apple: 9550.5s -> 8235.5s (-13.8%)
  2. dist-x86_64-apple: 7969.1s -> 6985.7s (-12.3%)
  3. dist-apple-various: 3601.4s -> 4036.2s (12.1%)
  4. dist-s390x-linux: 5400.7s -> 4785.3s (-11.4%)
  5. i686-gnu-2: 5545.9s -> 6170.4s (11.3%)
  6. x86_64-gnu-llvm-20-1: 3566.7s -> 3259.8s (-8.6%)
  7. armhf-gnu: 4910.6s -> 5295.3s (7.8%)
  8. x86_64-rust-for-linux: 2846.9s -> 3032.4s (6.5%)
  9. x86_64-gnu-tools: 3492.4s -> 3707.9s (6.2%)
  10. x86_64-msvc-ext2: 5950.3s -> 6309.5s (6.0%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#143191 Stabilize rwlock_downgrade library feature 3b3a8df4425ea7ae18c5a2414bd3157c30726c2c (link)
#147444 Allow printing a fully-qualified path in def_path_str 2b7495e3fd953c4db279b169dd78de1092988e6e (link)
#147527 Update t-compiler beta nomination Zulip msg b45499445661dc8c8dd435590d0f0b8d53a9bcab (link)
#147670 some ErrorGuaranteed cleanups 4cdde8014585d36726e8fdad41cd54d642fe0738 (link)
#147676 Return spans out of is_doc_comment to reduce reliance on … 24af68fde2c467e2fd51242f238dec3a43dcc4ec (link)
#147708 const mem::drop 3a31f72282a95329a7bedfff9d7951a0ab3ce25f (link)
#147710 Fix ICE when using contracts on async functions 17befebf496faa3a49ca5986e6c834e825c04c4a (link)
#147716 Fix some comments c106ef4d59dea986ced9b46986e96705a4e27d41 (link)
#147718 miri: use allocator_shim_contents codegen helper fac27455d470432bb6376c0bf0bc5510eeb70cd6 (link)
#147729 ignore boring locals when explaining why a borrow contains … 715f39bc11c1684b45b455b6d006d099dfe31af7 (link)
#147742 Revert unintentional whitespace changes to rustfmt-excluded… 45637c221700c528475cb28cc512fa9b00f1728a (link)

previous master: 57ef8d642d

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

@bors bors mentioned this pull request Oct 16, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (402ce0e): 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.0% [0.8%, 2.0%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -2.5%)

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.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

Results (primary -2.6%, secondary 1.9%)

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)
2.7% [2.2%, 3.1%] 5
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Binary size

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

Bootstrap: 476.546s -> 474.904s (-0.34%)
Artifact size: 388.06 MiB -> 388.04 MiB (-0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Oct 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.