Rollup of 6 pull requests by matthiaskrgr · Pull Request #157044 · rust-lang/rust

matthiaskrgr · 2026-05-28T05:53:39Z

Successful merges:

relnotes for 1.96 #156932 (relnotes for 1.96)
Add TypeId methods variants fields field for type_info #156403 (Add TypeId methods variants fields field for type_info)
Suggest adding quotation marks to identifiers in attributes #156797 (Suggest adding quotation marks to identifiers in attributes)
Allow building the source tarballs while offline #157014 (Allow building the source tarballs while offline)
#[expect] is an attribute valid for outer style #157023 (#[expect] is an attribute valid for outer style)
Show crate root path in misplaced crate-level attribute diagnostic #157025 (Show crate root path in misplaced crate-level attribute diagnostic)

…literal was expected

…_info`

Previously locally vendored dependencies wouldn't be reused when building the source tarball, instead everything would be downloaded from the internet again (if not in the cargo cache).

When a crate-level attribute like `#![feature(...)]` is used as an inner attribute inside a non-root module, the diagnostic now includes a help message pointing to the crate root file path, making it easier for users to find where the attribute should be placed.

Skip the "the crate root is at ..." help message when the misplaced crate-level attribute is already in the crate root file, since it adds no useful information in that case. Add a cross-file test to verify the help still appears when the attribute is in a different file from the crate root.

Place submod.rs under tests/ui/attributes/auxiliary/ and use #[path] to include it, matching the preferred compiletest test structure. Removes the need for //@ ignore-auxiliary.

Co-authored-by: Josh Stone <cuviper@gmail.com> Co-authored-by: alexey semenyuk <alexsemenyuk88@gmail.com>

@cuviper

relnotes for 1.96 r? @cuviper cc @rust-lang/release

@oli-obk

…nt, r=oli-obk Add `TypeId` methods `variants` `fields` `field` for `type_info` Tracking issue rust-lang#146922 - Adds `fn TypeId::variants` returns the number of variants, for struct and union and primitive types, it's always 1. - Adds `fn TypeId::fields` returns the number of fields. - Adds `fn TypeId::field` returns a field representing type `FieldId`. - Adds a new type `FieldId`, which is a wrapper of `FieldRepresentingType`'s `TypeId`. For methods `{fields,field}`, if indexing out of bounds, a compile-time error will be raised. Regarding the removal of `Type` items, this will be done in a later PR in one go. r? @oli-obk

…hanBrouwer Suggest adding quotation marks to identifiers in attributes When the user provides an identifier when a literal was expected in an attribute value, suggest adding quotation marks to the identifier to make it a string literal. For instance: ``` error: attribute value must be a literal --> $DIR/crate-type-non-crate.rs:9:16 | LL | #[crate_type = lib] | ^^^ help: try adding quotation marks: `"lib"` ```

…ieyouxu Allow building the source tarballs while offline Previously locally vendored dependencies wouldn't be reused when building the source tarball, instead everything would be downloaded from the internet again (if not in the cargo cache). Fixes rust-lang#156982

…=nnethercote `#[expect]` is an attribute valid for outer style

…lp-in-attr-style-diagnostic, r=JonathanBrouwer Show crate root path in misplaced crate-level attribute diagnostic Fixes rust-lang#157001 If you put `#![feature(...)]` inside a non-root module, the diagnostic tells you it can only be used at the crate root, but never says where the crate root actually is. Not great if you're new to Rust or working in a big workspace with nested modules. Now the diagnostic includes a help line with the crate root file path when the misplaced attribute is an inner attribute. Outer attributes already get a span note pointing at what they're applied to, so they don't need this. Path goes through `RemapPathScopeComponents::DIAGNOSTICS` so `--remap-path-prefix` is respected. ``` warning: the `#![feature]` attribute can only be used at the crate root --> src/foo.rs:1:1 | LL | #![feature(test)] | ^^^^^^^^^^^^^^^^^ | = help: the crate root is at `src/main.rs` ```

matthiaskrgr · 2026-05-28T05:53:58Z

@bors r+ rollup=never p=5

rust-bors · 2026-05-28T05:54:01Z

📌 Commit 89777ad has been approved by matthiaskrgr

It is now in the queue for this repository.

rust-bors · 2026-05-28T09:16:41Z

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 22m 10s
Pushing 59bc26c to main...

rust-timer · 2026-05-28T09:18:32Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#156403	Add `TypeId` methods `variants` `fields` `field` for `type_…	`ca4aeae97c23d45eddd7c2e6c99d313a4f3b5b62` (link)
#156797	Suggest adding quotation marks to identifiers in attributes	`846f45eff6e3c7694cf3e74f42435d501f862536` (link)
#156932	relnotes for 1.96	`b97999e160cb2c7d8298fcf65f110f744de0ed9e` (link)
#157014	Allow building the source tarballs while offline	`3a0c800aba240d343e17b63a2ee5cc30b57ecfa3` (link)
#157023	`#[expect]` is an attribute valid for outer style	`60df4cbf00e330ec313052796a380c2f0d5d59f7` (link)
#157025	Show crate root path in misplaced crate-level attribute dia…	`3f4c44cd63ce532bf9d8362fa146d254eda5978d` (link)

previous master: 8f02e856be

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

github-actions · 2026-05-28T09:19:42Z

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 8f02e85 (parent) -> 59bc26c (this PR)

Test differences

Show 40 test diffs

Stage 1

[ui] tests/ui/attributes/crate-root-path-in-different-file.rs: [missing] -> pass (J0)
[ui] tests/ui/reflection/variant_index_out_of_bounds.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/attributes/crate-root-path-in-different-file.rs: [missing] -> pass (J1)
[ui] tests/ui/reflection/variant_index_out_of_bounds.rs: [missing] -> pass (J1)

Additionally, 36 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 59bc26c76496c81c01963b59bca3563b60be5722 --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-ohos-aarch64: 52m 26s -> 1h 17m (+48.0%)
i686-gnu-2: 1h 22m -> 1h 50m (+34.1%)
dist-apple-various: 1h 26m -> 1h 53m (+32.3%)
i686-gnu-1: 1h 53m -> 2h 29m (+31.5%)
x86_64-msvc-ext1: 1h 43m -> 2h 16m (+31.0%)
dist-i686-msvc: 1h 47m -> 2h 14m (+24.5%)
x86_64-msvc-ext2: 1h 51m -> 1h 24m (-24.4%)
dist-x86_64-msvc-alt: 2h 46m -> 2h 11m (-21.1%)
x86_64-gnu-llvm-22-1: 1h 12m -> 57m 50s (-20.5%)
dist-aarch64-apple: 1h 43m -> 2h 1m (+16.8%)

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 · 2026-05-28T09:58:17Z

Finished benchmarking commit (59bc26c): comparison URL.

Overall result: ❌✅ regressions and 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.2%	[0.2%, 0.2%]	1
Regressions ❌ (secondary)	0.2%	[0.1%, 0.2%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.0%	[-0.0%, -0.0%]	1
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	1

Max RSS (memory usage)

Results (primary 0.6%, secondary 1.7%)

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

	mean	range	count
Regressions ❌ (primary)	1.5%	[1.0%, 1.8%]	3
Regressions ❌ (secondary)	4.3%	[1.9%, 9.9%]	5
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-2.6%	[-2.7%, -2.3%]	3
All ❌✅ (primary)	0.6%	[-2.1%, 1.8%]	4

Cycles

Results (primary 1.0%, secondary -3.6%)

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

	mean	range	count
Regressions ❌ (primary)	2.4%	[1.5%, 3.4%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.0%	[-2.0%, -2.0%]	1
Improvements ✅ (secondary)	-3.6%	[-3.8%, -3.4%]	2
All ❌✅ (primary)	1.0%	[-2.0%, 3.4%]	3

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 511.209s -> 510.899s (-0.06%)
Artifact size: 400.71 MiB -> 400.68 MiB (-0.01%)

SpriteOvO and others added 25 commits May 20, 2026 20:46

Fix typos in intrinsics::size_of_type_id panic message and doc comment

7a96d86

Add TypeId::variants method to get number of variants for type_info

d1ad629

Add TypeId::fields method to get number of fields for type_info

b50aae6

Inside attributes, suggest adding quotation marks to identifier when …

8fec623

…literal was expected

Add TypeId::field method to get a field representing type for `type…

28733aa

…_info`

add relnotes

76de222

Apply suggestion from @BoxyUwU

a7cdee1

Allow building the source tarballs while offline

b665316

Previously locally vendored dependencies wouldn't be reused when building the source tarball, instead everything would be downloaded from the internet again (if not in the cargo cache).

#[expect] is an attribute valid for outer style

2043790

Remove trailing whitespace left by deleted annotations

bb92226

Support quotation mark suggestion for attributes in apple tests

1fa9548

Mark submod.rs as auxiliary so compiletest skips it

59debaf

FieldId wraps FRT TypeId instead of the actual field TypeId

b513e53

Move multi-file test to use auxiliary/ directory layout

8db956b

Place submod.rs under tests/ui/attributes/auxiliary/ and use #[path] to include it, matching the preferred compiletest test structure. Removes the need for //@ ignore-auxiliary.

Apply suggestions from code review

fd3b569

Co-authored-by: Josh Stone <cuviper@gmail.com> Co-authored-by: alexey semenyuk <alexsemenyuk88@gmail.com>

clean up spaces and add a rustdoc anchor

dd6f520

Fix assert_matches! link

63d96cb

Rollup merge of rust-lang#156932 - BoxyUwU:relnotes_1_96_0, r=cuviper

54352a0

relnotes for 1.96 r? @cuviper cc @rust-lang/release

Rollup merge of rust-lang#157023 - samueltardieu:push-mwykwuslpolq, r…

7277731

…=nnethercote `#[expect]` is an attribute valid for outer style

rust-bors Bot added the rollup A PR which is a rollup label May 28, 2026

rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels May 28, 2026

rust-bors Bot 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 May 28, 2026

rust-bors Bot mentioned this pull request May 28, 2026

relnotes for 1.96 #156932

Merged

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 28, 2026

rust-bors Bot merged commit 59bc26c into rust-lang:main May 28, 2026
13 checks passed

rustbot added this to the 1.98.0 milestone May 28, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#157044

Rollup of 6 pull requests#157044
rust-bors[bot] merged 25 commits into
rust-lang:mainfrom
matthiaskrgr:rollup-BX6I8YG

matthiaskrgr commented May 28, 2026

Uh oh!

matthiaskrgr commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 28, 2026

Uh oh!

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

github-actions Bot commented May 28, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

matthiaskrgr commented May 28, 2026

Uh oh!

matthiaskrgr commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 28, 2026

Uh oh!

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

github-actions Bot commented May 28, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented May 28, 2026

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

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants