Skip to content

Rollup of 12 pull requests #143867

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 34 commits into from
Jul 13, 2025
Merged

Rollup of 12 pull requests #143867

merged 34 commits into from
Jul 13, 2025

Conversation

fmease
Copy link
Member

@fmease fmease commented Jul 13, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

no1wudi and others added 30 commits July 11, 2025 17:31
* Move `target_os = "nuttx"` from unix_legacy to arc4random section
* This aligns NuttX with other POSIX-compliant systems that support arc4random
* Improves random number generation quality on NuttX by using the system's
  built-in arc4random implementation instead of legacy fallback methods

NuttX supports arc4random_buf which provides better entropy and security
compared to the legacy random number generation methods.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
Additionally, `NO_DEBUG_ASSERTIONS` is set by CI that threads through to
the `./configure` script, which is somewhat fragile and "spooky action
at a distance". Instead, use env vars controlled by compiletest, whose
debug assertion info comes from bootstrap.
The test itself is still broken, but fix this gating separately first.
…trVisitor

Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
They do not have sensible defaults, and it is crucial that we get them
right.
It is *critical* that we maintain clear nomenclature in `compiletest`.
We have many types of "modes" in `compiletest` -- pass modes, coverage
modes, compare modes, you name it. `Mode` is also a *super* general
term. Rename it to `TestMode` to leave no room for such ambiguity.

As a follow-up, I also intend to introduce an enum for `TestSuite`, then
rid of all usage of glob re-exported `TestMode::*` enum variants -- many
test suites share the same name as the test mode.
I would like to introduce `TestSuite` over stringly-typed test suite
names, and some test suite names are the same as test modes, which can
make this very confusing.
std: move NuttX to use arc4random for random number generation

arc4random support in libc merged in rust-lang/libc#4464, so:

* Move `target_os = "nuttx"` from unix_legacy to arc4random section
* This aligns NuttX with other POSIX-compliant systems that support arc4random
* Improves random number generation quality on NuttX by using the system's built-in arc4random implementation instead of legacy fallback methods

NuttX supports arc4random_buf which provides better entropy and security compared to the legacy random number generation methods.
Some const_trait_impl test cleanups

Some tests we forgot to update when the feature gate was reimplemented

r? ``@fee1-dead`` ``@compiler-errors``
…Denton

Disambiguate between rustc vs std having debug assertions in `run-make-support` and `run-make` tests

`NO_DEBUG_ASSERTIONS` is set by CI that threads through to the `./configure.py` script, which is somewhat fragile and "spooky action at a distance". For `fmt-write-bloat`, this is actually wrong because the test wants to gate on *std* being built with debug assertions or not, whereas `NO_DEBUG_ASSERTIONS` determines *rustc* being built with debug assertions or not. Instead, use env vars controlled by compiletest, whose debug assertion info comes from bootstrap.

https://github.com/rust-lang/rust/blob/855e0fe46e68d94e9f6147531b75ac2d488c548e/src/ci/run.sh#L137-L146

`NO_DEBUG_ASSERTIONS` controls `--enable-debug-assertions`

https://github.com/rust-lang/rust/blob/855e0fe46e68d94e9f6147531b75ac2d488c548e/src/bootstrap/configure.py#L124

which sets `--rust.debug-assertions`, which controls *rustc* debug assertions.

https://github.com/rust-lang/rust/blob/855e0fe46e68d94e9f6147531b75ac2d488c548e/src/bootstrap/configure.py#L125-L129

`--rust.debug-assertions-std` controls *std* debug assertions.

Noticed while investigating `fmt-write-bloat` in rust-lang#143669 (comment).

Best reviewed commit-by-commit.

r? ``@ChrisDenton`` (or compiler/bootstrap)
…ieyouxu

Update sysinfo version to `0.36.0`

Bugfixes and some new API additions.
…ute-prefix, r=jdonszelmann

Fix ICE for parsed attributes with longer path not handled by CheckAttribute

Fixes rust-lang#137590
Fixes rust-lang#143789

r? ```@jdonszelmann```
…t-short-command-trait, r=Kobzol

Remove format short command trait

Since we no longer have traces of the vanilla command, and we're already implementing format_short_command for CommandFingerprint, we can use it directly from the fingerprint. This PR removes the standalone format_short_command trait and moves its implementation under CommandFingerprint.
…ompiler-errors

New tracking issues for const_ops and const_cmp

Let's do a clean start with new tracking issues to avoid mixing things up with the previous constification.

I assume the fact that the `PartialEq` *trait* and *impls* used different feature names  was a mistake (the feature name on the impl is entirely irrelevant anyway).

Part of rust-lang#143800, rust-lang#143802

r? ``@oli-obk``
…r, r=fmease

htmldocck: better error messages for some negative directives

Previously it was saying "did not match pattern" even when the error was that it did match the pattern, and it wasn't supposed to.
fmease added 2 commits July 13, 2025 07:21
…, r=Kobzol

[COMPILETEST-UNTANGLE 5/N] Test mode adjustments and other assorted cleanups

This is part of a patch series to untangle `compiletest` to hopefully nudge it towards being more maintainable.

This PR should contain no functional changes modulo the removed debugger version warning.

- Commit 1: Removes a very outdated debugger version warning.
- Commit 2: Moves `string_enum` out of `common` into `util` module.
- Commit 3: Remove `#[derive(Default)` for `Mode` and `Config`. It is very important for correctness that we *don't* `#[derive(Default)]`, because there are no sensible defaults, so stop pretending there is.
- Commit 4: Rename `Mode` -> `TestMode`, because I would like to introduce a `TestSuite` enum to stop using stringly-typed test suite names where test mode names can be the same as test suite names, and we also have a bunch of other "modes" in compiletest. Make this as unambiguous as possible. A corollary is that now it's more natural to reference via intra-doc links as ``[`TestMode`]``.
- Commit 5: Ditto on `TestSuite`, stop glob-reexporting `TestMode::*` variants, and always use `EnumName::VariantName` form.
- Commit 6: Apparently, `src/tools/rustdoc-gui-test/` depends on `compiletest` for `//@ {compile,run}-paths` directive parsing and extraction, which involves creating a dummy `compiletest` config (hence the existence of the default impls removed in Commit 3). Make this a specific associated function with a FIXME pointing to rust-lang#143827 as I think this setup is quite questionable.

Commits {4, 5} are also intended to help improve the self-consistency in nomenclature used within compiletest.

Best reviewed commit-by-commit.
Label clippy changes with `T-clippy`

- Commits {1,2} are just drive-by housekeeping, no functional changes.
- Commit 3 adds an autolabel for `src/tools/clippy` to be labelled with https://github.com/rust-lang/rust/labels/T-clippy.

r? `@apiraino` (or clippy, or anyone really)
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs 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. 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. rollup A PR which is a rollup labels Jul 13, 2025
@fmease
Copy link
Member Author

fmease commented Jul 13, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 13, 2025

📌 Commit 155eadf has been approved by fmease

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

bors commented Jul 13, 2025

⌛ Testing commit 155eadf with merge 0fb279b...

@bors
Copy link
Collaborator

bors commented Jul 13, 2025

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 0fb279b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 13, 2025
@bors bors merged commit 0fb279b into rust-lang:master Jul 13, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 13, 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 d2baa49 (parent) -> 0fb279b (this PR)

Test differences

Show 4 test diffs

Stage 1

  • [ui] tests/ui/attributes/builtin-attribute-prefix.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/attributes/builtin-attribute-prefix.rs: [missing] -> pass (J1)

Additionally, 2 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 0fb279be1d96464c69209053ef0f97ad63088cda --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: 9862.4s -> 7554.7s (-23.4%)
  2. aarch64-apple: 5380.4s -> 4531.4s (-15.8%)
  3. x86_64-gnu-tools: 3800.6s -> 3379.0s (-11.1%)
  4. x86_64-rust-for-linux: 2945.1s -> 2672.9s (-9.2%)
  5. pr-check-2: 2624.8s -> 2394.3s (-8.8%)
  6. i686-gnu-1: 8019.6s -> 7345.5s (-8.4%)
  7. i686-gnu-nopt-1: 8087.5s -> 7415.7s (-8.3%)
  8. x86_64-mingw-2: 7657.9s -> 7024.9s (-8.3%)
  9. x86_64-mingw-1: 9378.3s -> 8668.7s (-7.6%)
  10. i686-gnu-2: 6176.3s -> 5723.3s (-7.3%)
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
#143776 std: move NuttX to use arc4random for random number generat… 8341af38378685161b3c1ee3a898583e69a94dee (link)
#143778 Some const_trait_impl test cleanups ba091ec42abd2c2f257344bcb66d5e968fc784b9 (link)
#143782 Disambiguate between rustc vs std having debug assertions i… 1bee1cabef4039be7de264f3864008e2c99509ff (link)
#143791 Update sysinfo version to 0.36.0 80b8a0672a715714557e67665bccc0d4e2e73ac6 (link)
#143796 Fix ICE for parsed attributes with longer path not handled … cbea8f8caf577c9e8a8cb7e86fa2f38331f1ca9c (link)
#143798 Remove format short command trait 157bd89d2b7ab946bf3620f32f8099d4b7aaac3e (link)
#143803 New tracking issues for const_ops and const_cmp b638dd359dfbe0b941cfe3dcfa4b3e731788a612 (link)
#143814 htmldocck: better error messages for some negative directiv… f54c842167298225b4de9726c97033b9d804d0bf (link)
#143817 Access wasi_sdk_path instead of reading environment varia… c94a0197f33280853d1bda6537eb7b30052d506a (link)
#143822 ./x test miri: fix cleaning the miri_ui directory cc5a8e0d889a3480199888b67783578e6975f42e (link)
#143823 [COMPILETEST-UNTANGLE 5/N] Test mode adjustments and other … 8defe415f0cb56e4f30c00f26c1bc617821fecc2 (link)
#143841 Label clippy changes with T-clippy 7d82c569678436d0aed5e4c332571d567250817c (link)

previous master: d2baa49a10

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 (0fb279b): 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 -1.1%, secondary -3.9%)

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

mean range count
Regressions ❌
(primary)
4.1% [4.1%, 4.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.7% [-4.6%, -2.7%] 2
Improvements ✅
(secondary)
-3.9% [-3.9%, -3.9%] 1
All ❌✅ (primary) -1.1% [-4.6%, 4.1%] 3

Cycles

Results (primary 4.0%, secondary 2.1%)

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

mean range count
Regressions ❌
(primary)
4.0% [2.9%, 5.1%] 2
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 4.0% [2.9%, 5.1%] 2

Binary size

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

Bootstrap: 464.852s -> 490.115s (5.43%)
Artifact size: 374.71 MiB -> 374.71 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs 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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.