Skip to content

Rollup of 11 pull requests #140503

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
Apr 30, 2025
Merged

Rollup of 11 pull requests #140503

merged 28 commits into from
Apr 30, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 28 commits March 28, 2025 13:41
Most notably, the `FIXME` for suboptimal printing of `use` groups in
`tests/ui/macros/stringify.rs` is fixed. And all other test output
changes result in pretty printed output being closer to the original
formatting in the source code.
…homcc

Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`

More legible imo
```rs
#[test]
#[should_panic = "love"]
fn foo() {
    assert!(1 == 2);
}
```
Before:
```
note: panic did not contain expected string
      panic message: `"assertion failed: 1 == 2"`,
 expected substring: `"love"`
```
After:
```
note: panic did not contain expected string
      panic message: "assertion failed: 1 == 2"
 expected substring: "love"
```
Also removed the comma as `assert_eq!` / `assert_ne!` don't use one.

``@rustbot`` label +A-libtest
…agisa

uses_power_alignment: wording tweaks

Slightly improves the wording introduced with rust-lang#135552.
…provenance-139008, r=RalfJung

mention provenance in the pointer::wrapping_offset docs

fixes rust-lang#139008
…etrochenkov

Improve pretty-printing of braces

r? ````@petrochenkov````
…=compiler-errors

rm `TypeVistable` impls for `Canonical`

similar to `EarlyBinder`, you generally do not want to fold a canonical value directly without first instantiating it. In places where you do want to look into the `Canonical`, it's likely better to do so manually.

r? ```@compiler-errors```
…s-msa, r=jieyouxu

enable msa feature for mips in codegen tests

Fix codegen unit tests for mips by enabling the msa target feature.
…s, r=Kobzol

Add `rust.debug-assertions-tools` option

Before this PR, the two only options to configure the presence of debug assertions were the `rust.debug-assertions` and `rust.debug-assertions-std` options. The former applied to everything, and the latter allowed to override the setting just for the standard library. This combination of settings doesn't allow to enable debug assertions for the std and the compiler but not tools.

Some tools (like Cargo) are not really meant to be executed with debug assertions enabled, and in Ferrocene we hit some debug assertions in it that are exclusively meant for its test suite. We'd thus like to enable debug assertions everywhere but in tools.

This PR adds a `rust.debug-assertions-tools` setting that does exactly this.
…et, r=oli-obk

miri: algebraic intrinsics: bring back float non-determinism

Fixes rust-lang/miri#4289
Cc ```@bjoernager```
r? ```@oli-obk```
…1-dead

Treat ManuallyDrop as ~const Destruct

cc rust-lang#133214 (comment)

r? ```@compiler-errors```

cc ```@fee1-dead```
…errors

Rename `rustc_query_append!` to `rustc_with_all_queries!`

Whenever I'm trying to make sense of the query system internals, I always get tripped up on this unhelpfully-named macro. The fact that it's a higher-order proc macro is already mind-melting enough on its own.

This new name, `rustc_with_all_queries!`, forms a much more intuitive combination with the helper macros that it invokes. And only one of the call sites was even making use of the “append” part of its old name.

This PR also reformats the parameters matched by the helper macros, to make the actual argument syntax a bit easier to see.

---

Renaming and reformatting only; no functional changes.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-tidy Area: The tidy tool labels Apr 30, 2025
@rustbot rustbot 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. T-libs Relevant to the library 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 Apr 30, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

📌 Commit ae7d78a 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 Apr 30, 2025
@bors
Copy link
Collaborator

bors commented Apr 30, 2025

⌛ Testing commit ae7d78a with merge 7188f45...

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2025
@bors bors merged commit 7188f45 into rust-lang:master Apr 30, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 30, 2025
Copy link

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 d2eadb7 (parent) -> 7188f45 (this PR)

Test differences

Show 202 test diffs

Stage 1

  • [ui] tests/ui/diagnostic_namespace/on_impl_trait.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unimplemented/on_impl_trait.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-2823.rs: pass -> [missing] (J0)
  • [ui] tests/ui/noncopyable-class.rs: pass -> [missing] (J0)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop-no-drop-impl.rs#new: [missing] -> pass (J0)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop-no-drop-impl.rs#old: [missing] -> pass (J0)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop.rs#new: [missing] -> pass (J0)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop.rs#old: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/diagnostic_namespace/on_impl_trait.rs: pass -> [missing] (J1)
  • [ui] tests/ui/diagnostic_namespace/on_unimplemented/on_impl_trait.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-2823.rs: pass -> [missing] (J1)
  • [ui] tests/ui/noncopyable-class.rs: pass -> [missing] (J1)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop-no-drop-impl.rs#new: [missing] -> pass (J1)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop-no-drop-impl.rs#old: [missing] -> pass (J1)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop.rs#new: [missing] -> pass (J1)
  • [ui] tests/ui/traits/const-traits/drop-manually-drop.rs#old: [missing] -> pass (J1)

Additionally, 186 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 7188f453111502962326022740e2657fce0a6939 --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-1: 7030.9s -> 10742.5s (52.8%)
  2. dist-s390x-linux: 5278.7s -> 6226.5s (18.0%)
  3. x86_64-apple-2: 4664.8s -> 5498.7s (17.9%)
  4. x86_64-msvc-2: 7305.0s -> 6816.6s (-6.7%)
  5. dist-x86_64-apple: 8486.0s -> 8951.9s (5.5%)
  6. dist-x86_64-mingw: 7438.1s -> 7800.3s (4.9%)
  7. i686-msvc-1: 9714.7s -> 9270.2s (-4.6%)
  8. aarch64-apple: 4406.8s -> 4214.4s (-4.4%)
  9. x86_64-mingw-1: 8809.1s -> 9166.4s (4.1%)
  10. dist-x86_64-msvc-alt: 7623.0s -> 7339.5s (-3.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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#136160 Remove backticks from ShouldPanic::YesWithMessage's `TrFa… ebd8e1ed53fb2e5f31e4d822c6ee43cff108ca42 (link)
#139059 uses_power_alignment: wording tweaks 92528cf0db7b8da40d63c5e716b775b05097916b (link)
#139192 mention provenance in the pointer::wrapping_offset docs dce67d51f2102c4d4ee4288dce32c0c5be5edcfa (link)
#140312 Improve pretty-printing of braces 42d104a91c889ba0c86bd79e3fbacf04b860b763 (link)
#140404 rm TypeVistable impls for Canonical 98fc8868a4f494f5c266c2cfda08cea7c8ca56ee (link)
#140437 enable msa feature for mips in codegen tests 646cd1c38c0630fd3b39a82ac283947542a58146 (link)
#140438 Add rust.debug-assertions-tools option 3071e2f09a26b57938ac19ff0adf0c2f50d34414 (link)
#140439 miri: algebraic intrinsics: bring back float non-determinism 03e158ce86704a0e8cb73e440c3dc2a1d236922d (link)
#140445 Treat ManuallyDrop as ~const Destruct ceb3f5efcef9cbcb2db34a8e3f4a898bcabc5afc (link)
#140446 chore: fix some tests b65c44e5e0b3fc93f61bee2abec9ecfd023fb3b3 (link)
#140448 Rename rustc_query_append! to rustc_with_all_queries! f0c5d1e9ef510d897422cab3bed4d5a4fa3d979b (link)

previous master: d2eadb7a94

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7188f45): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.7% [0.7%, 4.6%] 7
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.9%, -0.4%] 29
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-0.9%, 4.6%] 36

Cycles

Results (primary 0.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.0% [0.4%, 3.2%] 26
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-2.4%, -0.5%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.7% [-2.4%, 3.2%] 31

Binary size

Results (primary -1.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Bootstrap: 770.233s -> 770.688s (0.06%)
Artifact size: 365.54 MiB -> 365.58 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-tidy Area: The tidy tool 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-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. T-libs Relevant to the library 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.