Never type after-stabilization cleanup - #161828

Merged

rust-bors[bot] merged 3 commits into

rust-lang:mainfrom

WaffleLapkin:never-type-cleanup

Aug 28, 2026

WaffleLapkin commented Aug 26, 2026

Member

r? @JonathanBrouwer

WaffleLapkin added 3 commits

August 26, 2026 19:40


          remove rustc_never_type_options attribute

0c99112

... and related machienery


          simplify fallback code

f23fe40


          unnecessary "optimization"

2a2ca58

rustbot commented Aug 26, 2026

Collaborator

Some changes occurred in compiler/rustc_attr_ir

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann, @JonathanBrouwer

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

rustbot added A-attributes S-waiting-on-review T-compiler labels

rustbot assigned JonathanBrouwer

JonathanBrouwer commented Aug 26, 2026

Member

@bors try @rust-timer queue
Not expecting anything significant but just in case

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf label

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #161828 - WaffleLapkin:never-type-cleanup, r=<try>

Never type after-stabilization cleanup

JonathanBrouwer approved these changes

View reviewed changes

JonathanBrouwer left a comment •

edited

Loading

Member

Took me a bit to get through the diff in fallback.rs but I'm pretty sure I understand it and it's correct
r=me with neutral or better perf

View changes since this review

rust-bors Bot commented Aug 26, 2026

Contributor

☀️ Try build successful (CI)
Build commit: 2143217 (2143217d6afb5b59bf6e45792d2aec53f9a8a53b)
Base parent: c241221 (c24122146bb8b9cfd9e5c067e0f736c59f5826a1)

This comment has been minimized.

Sign in to view

rust-timer commented Aug 26, 2026

Collaborator

Finished benchmarking commit (2143217): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking means the PR may be perf-sensitive. Consider adding rollup=never if this change is not fit for rolling up.

@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 2.5%, secondary -0.0%)

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

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

Cycles

Results (secondary 3.8%)

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

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

Binary size

Results (secondary -0.0%)

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

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

Bootstrap: 474.908s -> 475.785s (0.18%)
Artifact size: 402.63 MiB -> 400.63 MiB (-0.50%)

rustbot removed the S-waiting-on-perf label

JonathanBrouwer commented Aug 27, 2026

Member

@bors r+ rollup

rust-bors Bot commented Aug 27, 2026

Contributor

📌 Commit 2a2ca58 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors Bot added S-waiting-on-bors and removed S-waiting-on-review labels

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

326c42c

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

JonathanBrouwer mentioned this pull request

Rollup of 4 pull requests #161854

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

6d57d37

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

matthiaskrgr mentioned this pull request

Rollup of 4 pull requests #161863

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

5aa3b92

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

matthiaskrgr mentioned this pull request

Rollup of 5 pull requests #161869

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

193a59b

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

matthiaskrgr mentioned this pull request

Rollup of 7 pull requests #161871

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #161871 - matthiaskrgr:rollup-2T3ZVOD, r=matthiaskrgr

92f3c19

Rollup of 7 pull requests

Successful merges:

 - #150075 (Implement clamp_to)
 - #157145 (Codegen Overloaded LLVM intrinsics based on their name)
 - #161866 (delegation: add tests fixating behavior of delegating to default trait implementations)
 - #161456 (reduce perf impact of scalar size checks)
 - #161730 (Improve type mismatch annotation for lets with block-wrapped initializers)
 - #161828 (Never type after-stabilization cleanup)
 - #161860 (atomicptr.rs test: remove unused import)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

b5d15fb

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

matthiaskrgr mentioned this pull request

Rollup of 12 pull requests #161874

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

23a749e

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

JonathanBrouwer mentioned this pull request

Rollup of 11 pull requests #161875

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

f357f15

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

JonathanBrouwer mentioned this pull request

Rollup of 11 pull requests #161878

Closed

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

5e426f2

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

GuillaumeGomez mentioned this pull request

Rollup of 14 pull requests #161884

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #161884 - GuillaumeGomez:rollup-TXnqOcH, r=GuillaumeGomez

67c9671

Rollup of 14 pull requests

Successful merges:

 - #150075 (Implement clamp_to)
 - #159103 (fix(reborrow): recursive implementation)
 - #160848 (std: avoid aliasing violations when wrapping opaque C types)
 - #161421 (Include startup crt objects on WASI for more outputs)
 - #161805 (Prefer ambiguous candidates when deduplicating traits in scope, so `ambiguous_glob_imported_traits` doesn't depend on import order)
 - #161862 (Put data segment in specified section with link_section on wasm)
 - #161866 (delegation: add tests fixating behavior of delegating to default trait implementations)
 - #161456 (reduce perf impact of scalar size checks)
 - #161666 (Print vendor instructions in `x vendor`)
 - #161730 (Improve type mismatch annotation for lets with block-wrapped initializers)
 - #161828 (Never type after-stabilization cleanup)
 - #161860 (atomicptr.rs test: remove unused import)
 - #161870 (bind to [::1] instead of 127.0.0.1 in documentation examples for v6 UDP methods)
 - #161876 (rustdoc: Correctly handle when a macro generates multiple items in `--generate-macro-expansion`)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

70233c2

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

JonathanBrouwer mentioned this pull request

Rollup of 18 pull requests #161901

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#161828 - WaffleLapkin:never-type-cleanup, r…

aacc8cc

…=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

JonathanBrouwer mentioned this pull request

Rollup of 21 pull requests #161905

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #161905 - JonathanBrouwer:rollup-HgmRlVv, r=JonathanBro…

b7a36ac

…uwer

Rollup of 21 pull requests

Successful merges:

 - #158609 (Update sccache to 0.16.0)
 - #150075 (Implement clamp_to)
 - #159103 (fix(reborrow): recursive implementation)
 - #160562 (add target feature ABI checks for SPARC)
 - #160848 (std: avoid aliasing violations when wrapping opaque C types)
 - #161421 (Include startup crt objects on WASI for more outputs)
 - #161805 (Prefer ambiguous candidates when deduplicating traits in scope, so `ambiguous_glob_imported_traits` doesn't depend on import order)
 - #161862 (Put data segment in specified section with link_section on wasm)
 - #161866 (delegation: add tests fixating behavior of delegating to default trait implementations)
 - #161456 (reduce perf impact of scalar size checks)
 - #161528 (Add regression test to ensure optimal compilation)
 - #161666 (Print vendor instructions in `x vendor`)
 - #161730 (Improve type mismatch annotation for lets with block-wrapped initializers)
 - #161828 (Never type after-stabilization cleanup)
 - #161859 (Do not optimize MIR for comptime ConstFns)
 - #161860 (atomicptr.rs test: remove unused import)
 - #161870 (bind to [::1] instead of 127.0.0.1 in documentation examples for v6 UDP methods)
 - #161876 (rustdoc: Correctly handle when a macro generates multiple items in `--generate-macro-expansion`)
 - #161889 (Add link to ownership section in ptr::read docs)
 - #161890 (rustdoc: some clarifying comments)
 - #161891 (Mark `extern_item_impls` feature as incomplete)

Failed merges:

 - #161702 (Use `drop_guard` in some places in {core,alloc,std})

JonathanBrouwer mentioned this pull request

Rollup of 21 pull requests #161906

Merged

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #161906 - JonathanBrouwer:rollup-obMe707, r=JonathanBro…

344f790

…uwer

Rollup of 21 pull requests

Successful merges:

 - #150075 (Implement clamp_to)
 - #159103 (fix(reborrow): recursive implementation)
 - #160562 (add target feature ABI checks for SPARC)
 - #160848 (std: avoid aliasing violations when wrapping opaque C types)
 - #161421 (Include startup crt objects on WASI for more outputs)
 - #161805 (Prefer ambiguous candidates when deduplicating traits in scope, so `ambiguous_glob_imported_traits` doesn't depend on import order)
 - #161862 (Put data segment in specified section with link_section on wasm)
 - #161866 (delegation: add tests fixating behavior of delegating to default trait implementations)
 - #157218 (Track items behind `cfg_select` in the same way we do for `cfg`)
 - #161456 (reduce perf impact of scalar size checks)
 - #161528 (Add regression test to ensure optimal compilation)
 - #161666 (Print vendor instructions in `x vendor`)
 - #161730 (Improve type mismatch annotation for lets with block-wrapped initializers)
 - #161828 (Never type after-stabilization cleanup)
 - #161859 (Do not optimize MIR for comptime ConstFns)
 - #161860 (atomicptr.rs test: remove unused import)
 - #161870 (bind to [::1] instead of 127.0.0.1 in documentation examples for v6 UDP methods)
 - #161876 (rustdoc: Correctly handle when a macro generates multiple items in `--generate-macro-expansion`)
 - #161889 (Add link to ownership section in ptr::read docs)
 - #161890 (rustdoc: some clarifying comments)
 - #161891 (Mark `extern_item_impls` feature as incomplete)

Failed merges:

 - #161702 (Use `drop_guard` in some places in {core,alloc,std})

rust-bors Bot merged commit 730d9f6 into rust-lang:main

14 checks passed

rustbot added this to the 1.100.0 milestone

rust-bors Bot pushed a commit that referenced this pull request


          Unrolled build for #161828 in rollup 161906

22227a6

Rollup merge of #161828 - WaffleLapkin:never-type-cleanup, r=JonathanBrouwer

Never type after-stabilization cleanup

r? @JonathanBrouwer

mejrs mentioned this pull request

remove rustc_never_type_options attr remnants #161974

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes S-waiting-on-bors T-compiler