Skip to content

Rollup of 11 pull requests #144130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Jul 18, 2025
Merged

Rollup of 11 pull requests #144130

merged 28 commits into from
Jul 18, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jul 18, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 28 commits July 9, 2025 17:07
And include `.github/workflows` for `T-infra` trigger files.
Reverting file name weird-exprs.rs due to its historical use, recognition in community and references
Also make it *only* usable on nightly
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Add a test showing `#![feature(default_field_values)]` using `#[const_trait] trait Default` (`#![feature(const_default)]` + `#![feature(const_trait_impl)]`).
Remove duplicate error about raw underscore lifetime

Fixes rust-lang#143152

r? ```@fee1-dead```
…-value, r=oli-obk

Add test for `default_field_values` and `const_default`

Add a test showing `#![feature(default_field_values)]` using `#[const_trait] trait Default` (`#![feature(const_default)]` + `#![feature(const_trait_impl)]`).

CC rust-lang#132162
…=oli-obk

Make `AsyncDrop` check that it's being implemented on a local ADT

Fixes rust-lang#143691
`tests/ui`: A New Order [0/28]

> [!NOTE]
>
> Intermediate commits are intended to help review, but will be squashed prior to merge.

These are the some last tests that didn’t make it into the main twenty-eightology of PRs. Part of rust-lang#133895.

r? ```@jieyouxu```
docs(alloc::fmt): Make type optional, instead of matching empty string

Think this is clearer.

Noticed as I was implementing [`tree-sitter-rust-format-args`](https://github.com/nik-rev/tree-sitter-rust-format-args), and attempting to match the empty string results in an error.
…ee1-dead

Make slice comparisons const

This needed a fix for `derive_const`, too, as it wasn't usable in libcore anymore as trait impls need const stability attributes. I think we can't use the same system as normal trait impls while `const_trait_impl` is still unstable.

r? ```@fee1-dead```

cc rust-lang#143800
…, r=oli-obk

Use $crate in macros for rustc_public (aka stable_mir)

This makes `#[macro_use] extern crate rustc_public` unnecessary (which brings all of `rustc_public`'s macros into scope for the entire crate); instead, now you can simply use `rustc_public::run!()`.
resolve: Make disambiguators for underscore bindings module-local

Disambiguators attached to underscore name bindings (like `const _: u8 = something;`) do not need to be globally unique, they just need to be unique inside the module in which they live, because the bindings in a module are basically kept as `Map<BindingKey, SomeData>`.

Also, the specific values of the disambiguators are not important, so a glob import of `const _` may have a different disambiguator than the original `const _` itself.

So in this PR the disambiguator is just set to the current number of bindings in the module.
This removes one more piece of global mutable state from resolver and unblocks rust-lang#143884.
…ler-errors

Fix wrong messages from methods with the same name from different traits

fix issue rust-lang#143740
Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels

- Commit 1 is a drive-by adjustment. Auto-label `src/ci` and `.github/workflows` with https://github.com/rust-lang/rust/labels/A-CI, and include `.github/workflows` for https://github.com/rust-lang/rust/labels/T-infra trigger files.
- Commit 2 adds myself to the `infra-ci` reviewer adhoc group.

r? ``````@Kobzol``````
ci: use windows 22 for all free runners

try-job: `x86_64-msvc-*`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc labels Jul 18, 2025
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. rollup A PR which is a rollup labels Jul 18, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 18, 2025

📌 Commit fd18175 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 Jul 18, 2025
@bors
Copy link
Collaborator

bors commented Jul 18, 2025

⌛ Testing commit fd18175 with merge 8231065...

@bors
Copy link
Collaborator

bors commented Jul 18, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 18, 2025
@bors bors merged commit 8231065 into rust-lang:master Jul 18, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 18, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#143280 Remove duplicate error about raw underscore lifetime 1fca29dd7fdbbdd28cc73b886d1b673cf59036ee (link)
#143649 Add test for default_field_values and const_default d6e1c9ef3dd16952956b99d815f3231a4ff8d1cd (link)
#143699 Make AsyncDrop check that it's being implemented on a loc… b12adf33486a4d57118754782ac831111f172153 (link)
#143908 tests/ui: A New Order [0/28] 3bd65fba2a58c15aa2b503343f4a535331ed593c (link)
#143909 docs(alloc::fmt): Make type optional, instead of matching e… 0b19a3f785c5679afd3b039700515e0f42662fa1 (link)
#143925 Make slice comparisons const 1ccaf86fb34bf898990b6bd2fc58fd2f0141e875 (link)
#143997 Use $crate in macros for rustc_public (aka stable_mir) 10b10c161e7c94e7e83e89ccefb2b0e5d662d18e (link)
#144013 resolve: Make disambiguators for underscore bindings module… b5df05dc65400d3110bcf72ab672eef77fefa166 (link)
#144029 Fix wrong messages from methods with the same name from dif… f383fa63922a94f34239beec29eac6d45c5c7ccd (link)
#144063 Add myself to the infra-ci reviewer group and adjust some… 47fd8565592da7db39c3bc713f309f6fec211f5a (link)
#144069 ci: use windows 22 for all free runners 3af026bd88bbfa2c8a0e0626784fc7fd10ddc5f4 (link)

previous master: 6caa224a24

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

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 6caa224 (parent) -> 8231065 (this PR)

Test differences

Show 1179 test diffs

Stage 1

  • [ui] tests/ui/darwin-ld64.rs: ignore (only executed when the target is x86_64-apple-darwin) -> [missing] (J3)
  • [ui] tests/ui/deduplicate-diagnostics.rs#duplicate: pass -> [missing] (J3)
  • [ui] tests/ui/expr/syntax-edge-cases-lint-clean.rs: pass -> [missing] (J3)
  • [ui] tests/ui/expr/weird-exprs.rs: [missing] -> pass (J3)
  • [ui] tests/ui/lexical-scopes.rs: pass -> [missing] (J3)
  • [ui] tests/ui/underscore-lifetime/raw-underscore-lifetime.rs: [missing] -> pass (J3)

Stage 2

  • [debuginfo-cdb] tests/debuginfo/basic-types-globals.rs#lto: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/basic-types-globals.rs#no-lto: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/basic-types.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/borrowed-c-style-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/borrowed-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/borrowed-unique-basic.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/by-value-non-immediate-argument.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/by-value-self-argument-in-trait-impl.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/c-style-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/captured-fields-2.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/closure-in-generic-function.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/closures.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-external-attr.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-external-flag-overriden-by-attr.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-in-non-collapse-macro.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-static-external.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-static.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-with-attr-flag.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/collapse-debuginfo-with-yes-flag.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/constant-ordering-prologue.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/coroutine-locals.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/coroutine-objects.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/cross-crate-spans.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/destructured-fn-argument.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/destructured-local.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/evec-in-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/function-arguments.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/function-call.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/function-names.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/gdb-char.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/gdb-pretty-struct-and-enums.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-enum-with-different-disr-sizes.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-functions-nested.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-method-on-generic-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-struct-style-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/generic-tuple-style-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/issue-12886.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/issue-13213.rs: [missing] -> ignore (ignored when the debugger is cdb (Fails with exit code 0xc0000135 ("the application failed to initialize properly"))) (J0)
  • [debuginfo-cdb] tests/debuginfo/issue-14411.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/issue-22656.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/issue-7712.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/lexical-scope-in-unconditional-loop.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/lexical-scope-in-while.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/lexical-scopes-in-block-expression.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/method-on-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/method-on-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/method-on-trait.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/multiline-calls.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/multiple-functions.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/mutex.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/name-shadowing-and-scope-nesting.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/no_mangle-info.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/option-like-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/packed-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/path.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/pretty-huge-vec.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/pretty-std.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/pretty-uninitialized-vec.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/range-types.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/rc_arc.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/recursive-type-with-gat.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/reference-debuginfo.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/regression-bad-location-list-67992.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/result-types.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/rwlock-read.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/self-in-generic-default-method.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/shadowed-argument.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/shadowed-variable.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/should-fail.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/simd.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/simple-lexical-scope.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/simple-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/simple-tuple.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/skip_second_statement.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/static-method-on-struct-and-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/thread-names.rs#macos: [missing] -> ignore (only executed when the operating system is macos) (J0)
  • [debuginfo-cdb] tests/debuginfo/trait-pointers.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/tuple-struct.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/tuple-style-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/type-names.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/unique-enum.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/unit-type.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/unsized.rs: [missing] -> pass (J0)
  • [debuginfo-cdb] tests/debuginfo/zst-interferes-with-prologue.rs: [missing] -> pass (J0)
  • [ui] tests/ui/async-await/async-drop/foreign-fundamental.rs: [missing] -> pass (J1)
  • [ui] tests/ui/deduplicate-diagnostics.rs#duplicate: pass -> [missing] (J1)
  • [ui] tests/ui/diagnostic-flags/deduplicate-diagnostics.rs#deduplicate: [missing] -> pass (J1)
  • [ui] tests/ui/log-poly.rs: pass -> [missing] (J1)
  • [ui] tests/ui/methods/wrong-ambig-message.rs: [missing] -> pass (J1)
  • [ui] tests/ui/struct-ctor-mangling.rs: pass -> [missing] (J1)
  • [ui] tests/ui/symbol-names/struct-constructor-mangling.rs: [missing] -> pass (J1)
  • [ui] tests/ui/darwin-ld64.rs: ignore (only executed when the target is x86_64-apple-darwin) -> [missing] (J2)
  • [ui] tests/ui/linking/ld64-cross-compilation.rs: [missing] -> ignore (only executed when the target is x86_64-apple-darwin) (J2)

(and 105 additional test diffs)

Additionally, 974 doctest diffs were found. These are ignored, as they are noisy.

Job group index

  • J0: x86_64-msvc-1
  • J1: aarch64-apple, aarch64-gnu, aarch64-msvc-1, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-19-2, x86_64-gnu-llvm-20-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J2: aarch64-apple, aarch64-gnu, aarch64-msvc-1, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-gnu, x86_64-gnu-llvm-19-2, x86_64-gnu-llvm-20-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J3: x86_64-gnu-llvm-19-3, x86_64-gnu-llvm-20-3
Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 82310651b93a594a3fd69015e1562186a080d94c --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. x86_64-apple-2: 2969.2s -> 4737.8s (59.6%)
  2. dist-apple-various: 6159.8s -> 7691.3s (24.9%)
  3. aarch64-apple: 4380.4s -> 5337.8s (21.9%)
  4. x86_64-msvc-ext2: 5465.4s -> 6429.3s (17.6%)
  5. x86_64-msvc-1: 9264.8s -> 8004.8s (-13.6%)
  6. dist-x86_64-apple: 7237.9s -> 7833.2s (8.2%)
  7. x86_64-gnu: 7449.9s -> 6884.9s (-7.6%)
  8. x86_64-msvc-2: 7294.5s -> 6745.8s (-7.5%)
  9. aarch64-msvc-2: 5331.2s -> 5703.1s (7.0%)
  10. x86_64-gnu-miri: 4670.2s -> 4981.3s (6.7%)
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 (8231065): comparison URL.

Overall result: ✅ improvements - 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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.3% [-0.4%, -0.3%] 3
Improvements ✅
(secondary)
-0.3% [-0.4%, -0.2%] 6
All ❌✅ (primary) -0.3% [-0.4%, -0.3%] 3

Max RSS (memory usage)

Results (primary 1.1%, secondary 1.0%)

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

mean range count
Regressions ❌
(primary)
1.9% [1.4%, 2.9%] 3
Regressions ❌
(secondary)
1.0% [1.0%, 1.0%] 1
Improvements ✅
(primary)
-1.4% [-1.4%, -1.4%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.1% [-1.4%, 2.9%] 4

Cycles

Results (primary 2.2%)

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

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

Binary size

Results (primary -0.1%, secondary -0.2%)

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.2%, 0.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.2%, -0.0%] 13
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) -0.1% [-0.2%, 0.2%] 14

Bootstrap: 465.653s -> 465.935s (0.06%)
Artifact size: 374.62 MiB -> 374.69 MiB (0.02%)

tgross35 added a commit to tgross35/compiler-builtins that referenced this pull request Jul 18, 2025
To prepare for merging from rust-lang/rust, set the version file to:

    82310651b Auto merge of rust-lang/rust#144130 - matthiaskrgr:rollup-t75stad, r=matthiaskrgr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.