Rollup of 8 pull requests #140298

matthiaskrgr · 2025-04-25T15:31:51Z

Successful merges:

Add a tidy check for GCC submodule version #137683 (Add a tidy check for GCC submodule version)
Update the index of Result to make the summary more comprehensive #138968 (Update the index of Result to make the summary more comprehensive)
docs(std): mention const blocks in const keyword doc page #139572 (docs(std): mention const blocks in const keyword doc page)
Unify the format of rustc cli flags #140152 (Unify the format of rustc cli flags)
fix ICE in #[naked] attribute validation #140193 (fix ICE in #[naked] attribute validation)
Tidying up UI tests [2/N] #140205 (Tidying up UI tests [2/N])
remove expect() in unnecessary_transmutes #140284 (remove expect() in unnecessary_transmutes)
rustdoc: fix typo change from equivelent to equivalent #140290 (rustdoc: fix typo change from equivelent to equivalent)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: xizheyin <[email protected]>

To keep it in sync with rustc_codegen_gcc.

Signed-off-by: xizheyin <[email protected]>

…aumeGomez Add a tidy check for GCC submodule version To make sure that it stays in sync with the required GCC version of the GCC codegen backend. The check should succeed on CI, although it will fail after rust-lang#137660, until the next GCC sync. r? `@GuillaumeGomez`

…oc, r=Amanieu Update the index of Result to make the summary more comprehensive fix rust-lang#138966 This PR and rust-lang#138957 are twin PR r? `@Amanieu`

…t-blocks-in-const-keyword-doc-page, r=tgross35 docs(std): mention const blocks in const keyword doc page Aims to close rust-lang#139549

Unify the format of rustc cli flags As mentioned in rust-lang#140102, I unified the format of rustc CLI flags. I use the following rules: 1. `<param>`: Indicates a required parameter 2. `[param]`: Indicates an optional parameter 3. `|`: Indicates a mutually exclusive option 4. `*`: a list element with description Current output: ```bash Usage: rustc [OPTIONS] INPUT Options: -h, --help Display this message --cfg <SPEC> Configure the compilation environment. SPEC supports the syntax `<NAME>[="<VALUE>"]`. --check-cfg <SPEC> Provide list of expected cfgs for checking -L [<KIND>=]<PATH> Add a directory to the library search path. The optional KIND can be one of <dependency|crate|native|framework|all> (default: all). -l [<KIND>[:<MODIFIERS>]=]<NAME>[:<RENAME>] Link the generated crate(s) to the specified native library NAME. The optional KIND can be one of <static|framework|dylib> (default: dylib). Optional comma separated MODIFIERS <bundle|verbatim|whole-archive|as-needed> may be specified each with a prefix of either '+' to enable or '-' to disable. --crate-type <bin|lib|rlib|dylib|cdylib|staticlib|proc-macro> Comma separated list of types of crates for the compiler to emit --crate-name <NAME> Specify the name of the crate being built --edition <2015|2018|2021|2024|future> Specify which edition of the compiler to use when compiling code. The default is 2015 and the latest stable edition is 2024. --emit <TYPE>[=<FILE>] Comma separated list of types of output for the compiler to emit. Each TYPE has the default FILE name: * asm - CRATE_NAME.s * llvm-bc - CRATE_NAME.bc * dep-info - CRATE_NAME.d * link - (platform and crate-type dependent) * llvm-ir - CRATE_NAME.ll * metadata - libCRATE_NAME.rmeta * mir - CRATE_NAME.mir * obj - CRATE_NAME.o * thin-link-bitcode - CRATE_NAME.indexing.o --print <INFO>[=<FILE>] Compiler information to print on stdout (or to a file) INFO may be one of <all-target-specs-json|calling-conventions|cfg|check-cfg|code-models|crate-name|crate-root-lint-levels|deployment-target|file-names|host-tuple|link-args|native-static-libs|relocation-models|split-debuginfo|stack-protector-strategies|supported-crate-types|sysroot|target-cpus|target-features|target-libdir|target-list|target-spec-json|tls-models>. -g Equivalent to -C debuginfo=2 -O Equivalent to -C opt-level=3 -o <FILENAME> Write output to FILENAME --out-dir <DIR> Write output to compiler-chosen filename in DIR --explain <OPT> Provide a detailed explanation of an error message --test Build a test harness --target <TARGET> Target triple for which the code is compiled -A, --allow <LINT> Set lint allowed -W, --warn <LINT> Set lint warnings --force-warn <LINT> Set lint force-warn -D, --deny <LINT> Set lint denied -F, --forbid <LINT> Set lint forbidden --cap-lints <LEVEL> Set the most restrictive lint level. More restrictive lints are capped at this level -C, --codegen <OPT>[=<VALUE>] Set a codegen option -V, --version Print version info and exit -v, --verbose Use verbose output Additional help: -C help Print codegen options -W help Print 'lint' options and default settings -Z help Print unstable compiler options --help -v Print the full set of options rustc accepts ```

…nszelmann fix ICE in `#[naked]` attribute validation fixes rust-lang#140082 The comment here https://github.com/rust-lang/rust/pull/139615/files#r2040684192 is relevant, a better way to print the full path would be nice. If there's an issue I should `FIXME` this with let me know. r? `@jdonszelmann` cc `@nnethercote` rust-lang#139615

…youxu Tidying up UI tests [2/N] Part of rust-lang#133895 Moved the location of the tests that were in `tests/ui` and added descriptions! I'll squash before merge! r? jieyouxu

…eyouxu remove expect() in `unnecessary_transmutes` removes expect() from rust-lang#136083 and fixes rust-lang#140277 includes regression test r? lcnr

…oc-search, r=GuillaumeGomez rustdoc: fix typo change from equivelent to equivalent This PR fixes a typo in the search section in `rustdoc` book.

matthiaskrgr · 2025-04-25T15:39:15Z

@bors r+ rollup=never p=5

bors · 2025-04-25T15:39:18Z

📌 Commit 99dc43b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-04-25T18:51:18Z

⌛ Testing commit 99dc43b with merge b4c8b0c...

bors · 2025-04-25T21:57:06Z

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

github-actions · 2025-04-25T21:58:54Z

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 e3e432d (parent) -> b4c8b0c (this PR)

Test differences

Show 586 test diffs

Stage 1

[ui] tests/ui/capture1.rs: pass -> [missing] (J0)
[ui] tests/ui/copy-a-resource.rs: pass -> [missing] (J0)
[ui] tests/ui/fail-simple.rs: pass -> [missing] (J0)
[ui] tests/ui/macros/no-matching-rule.rs: [missing] -> pass (J0)
[ui] tests/ui/methods/clone-missing.rs: [missing] -> pass (J0)
[ui] tests/ui/modules/mod-pub-access.rs: [missing] -> pass (J0)
[ui] tests/ui/path.rs: pass -> [missing] (J0)
[ui] tests/ui/resolve/fn-item-cant-capture-dynamic-env.rs: [missing] -> pass (J0)
[ui] tests/ui/transmute/unnecessary-transmute-path-remap-ice-140277.rs: [missing] -> pass (J0)
[ui] tests/ui/type-alias/type-param.rs: [missing] -> pass (J0)
[ui] tests/ui/type-param.rs: pass -> [missing] (J0)

Stage 2

[ui] tests/ui/capture1.rs: pass -> [missing] (J1)
[ui] tests/ui/copy-a-resource.rs: pass -> [missing] (J1)
[ui] tests/ui/fail-simple.rs: pass -> [missing] (J1)
[ui] tests/ui/macros/no-matching-rule.rs: [missing] -> pass (J1)
[ui] tests/ui/methods/clone-missing.rs: [missing] -> pass (J1)
[ui] tests/ui/modules/mod-pub-access.rs: [missing] -> pass (J1)
[ui] tests/ui/path.rs: pass -> [missing] (J1)
[ui] tests/ui/resolve/fn-item-cant-capture-dynamic-env.rs: [missing] -> pass (J1)
[ui] tests/ui/transmute/unnecessary-transmute-path-remap-ice-140277.rs: [missing] -> pass (J1)
[ui] tests/ui/type-alias/type-param.rs: [missing] -> pass (J1)
[ui] tests/ui/type-param.rs: pass -> [missing] (J1)

Additionally, 564 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 b4c8b0c3f0533bb342a4873ff59bdad3883ab8e3 --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

dist-x86_64-apple: 10733.7s -> 8618.2s (-19.7%)
aarch64-apple: 4127.6s -> 4935.9s (19.6%)
x86_64-apple-1: 9348.1s -> 7871.1s (-15.8%)
dist-aarch64-apple: 5250.6s -> 5946.0s (13.2%)
dist-loongarch64-musl: 5889.7s -> 5239.1s (-11.0%)
x86_64-gnu-distcheck: 4951.1s -> 4419.6s (-10.7%)
x86_64-apple-2: 5102.4s -> 5644.3s (10.6%)
dist-x86_64-msvc: 6732.8s -> 6085.6s (-9.6%)
i686-msvc-2: 7094.0s -> 7626.3s (7.5%)
x86_64-rust-for-linux: 2661.9s -> 2492.9s (-6.4%)

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 · 2025-04-25T21:59:21Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#137683	Add a tidy check for GCC submodule version	`a48358c88928a87e6a872ffc92eb376f69a4d11d` (link)
#138968	Update the index of Result to make the summary more compreh…	`cc632ba4eda258f214db71aab535bd657e19d1c1` (link)
#139572	docs(std): mention const blocks in const keyword doc page	`e80216abaade5dc9464ea095c1cc6b3dbdd03470` (link)
#140152	Unify the format of rustc cli flags	`1803f09444d88da6714fe872f790e7f8c2bb9f6a` (link)
#140193	fix ICE in `#[naked]` attribute validation	`b652325150977e54f83cf7225f2b764f1b801d7c` (link)
#140205	Tidying up UI tests [2/N]	`cdebf317027c44320d10bb28864ba92529d8eeee` (link)
#140284	remove expect() in `unnecessary_transmutes`	`cf838660c4ba468d802574cdfb88e479f290e130` (link)
#140290	rustdoc: fix typo change from equivelent to equivalent	`6e6a2585432cd90e4d76fe5e7b839d2ff62d4204` (link)

previous master: e3e432d4d6

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 · 2025-04-25T23:26:22Z

Finished benchmarking commit (b4c8b0c): comparison URL.

Overall result: ❌✅ regressions and 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)	1.4%	[1.4%, 1.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 1.4%, secondary 1.5%)

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.4%	[0.5%, 2.8%]	4
Regressions ❌ (secondary)	1.5%	[0.9%, 2.6%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.4%	[0.5%, 2.8%]	4

Cycles

Results (primary -0.2%)

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.6%	[0.6%, 0.6%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-1.1%, 0.6%]	2

Binary size

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

Bootstrap: 774.908s -> 775.721s (0.10%)
Artifact size: 365.14 MiB -> 365.17 MiB (0.01%)

Natural-selection1 and others added 24 commits March 26, 2025 14:37

Update the index of Result to make the summary more comprehensive

13303a5

Solved suggestions

f8f2330

fix ICE in attribute name printing

a4630f7

keep original text for is_ok and is_err

f86cd70

add examples using .as_ref() for is_err_and and is_ok_and

56d5efc

fix example

3a14991

fix doc error

1fd928e

Unify the format of rustc cli flags

d054690

Signed-off-by: xizheyin <[email protected]>

Solved suggestions

cdc7298

docs(std): mention const blocks in const keyword doc page

49cb451

Add a tidy check for GCC submodule version

0e4ffa1

Update gcc submodule to 0ea98a1365b81f7488073512c850e8ee951a4afd

796a9ee

To keep it in sync with rustc_codegen_gcc.

rustdoc: fix typo change from equivelent to equivalent

8604d0f

Add option style comment for rustc_optgroups

999b906

Signed-off-by: xizheyin <[email protected]>

Cleaned up 5 tests in tests/ui

db2a73e

remove expect() in unnecessary_transmutes

d3a4ebc

Rollup merge of rust-lang#138968 - Natural-selection1:update-Result-d…

a353796

…oc, r=Amanieu Update the index of Result to make the summary more comprehensive fix rust-lang#138966 This PR and rust-lang#138957 are twin PR r? `@Amanieu`

Rollup merge of rust-lang#139572 - ismailarilik:docs/std/mention-cons…

394cdca

…t-blocks-in-const-keyword-doc-page, r=tgross35 docs(std): mention const blocks in const keyword doc page Aims to close rust-lang#139549

Rollup merge of rust-lang#140205 - reddevilmidzy:clean-up-test, r=jie…

8888488

…youxu Tidying up UI tests [2/N] Part of rust-lang#133895 Moved the location of the tests that were in `tests/ui` and added descriptions! I'll squash before merge! r? jieyouxu

Rollup merge of rust-lang#140284 - bend-n:fix-expectation-unmet, r=ji…

4323939

…eyouxu remove expect() in `unnecessary_transmutes` removes expect() from rust-lang#136083 and fixes rust-lang#140277 includes regression test r? lcnr

Rollup merge of rust-lang#140290 - styvane:patch0001-fix-typo-in-rusd…

99dc43b

…oc-search, r=GuillaumeGomez rustdoc: fix typo change from equivelent to equivalent This PR fixes a typo in the search section in `rustdoc` book.

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. rollup A PR which is a rollup labels Apr 25, 2025

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 25, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2025

bors merged commit b4c8b0c into rust-lang:master Apr 25, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #140298

Rollup of 8 pull requests #140298

matthiaskrgr commented Apr 25, 2025

matthiaskrgr commented Apr 25, 2025

bors commented Apr 25, 2025

bors commented Apr 25, 2025

bors commented Apr 25, 2025

github-actions bot commented Apr 25, 2025

Stage 1

Stage 2

rust-timer commented Apr 25, 2025

rust-timer commented Apr 25, 2025

Rollup of 8 pull requests #140298

Rollup of 8 pull requests #140298

Conversation

matthiaskrgr commented Apr 25, 2025

matthiaskrgr commented Apr 25, 2025

bors commented Apr 25, 2025

bors commented Apr 25, 2025

bors commented Apr 25, 2025

github-actions bot commented Apr 25, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented Apr 25, 2025

rust-timer commented Apr 25, 2025

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size