Skip to content

Rollup of 15 pull requests - #160309

Closed
jhpratt wants to merge 36 commits into
rust-lang:mainfrom
jhpratt:rollup-Ef2gOQQ
Closed

Rollup of 15 pull requests#160309
jhpratt wants to merge 36 commits into
rust-lang:mainfrom
jhpratt:rollup-Ef2gOQQ

Conversation

@jhpratt

@jhpratt jhpratt commented Aug 1, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

cjgillot and others added 30 commits July 11, 2026 18:19
Constructing an Rc<[T]> or Arc<[T]> whose header + payload layout exceeds
isize::MAX unwrapped a LayoutError, panicking with the opaque "called
`Result::unwrap()` on an `Err` value: LayoutError". Match Vec and Box by
reporting "capacity overflow" instead, and add regression tests.
This FIXME was added in [1], at which point there were 8 arguments. Now
there are only 5, which is much more reasonable.

This commit was brought to you by https://oli-obk.github.io/fixmeh/.

[1]: rust-lang#78923
Forbid super/crate/self/Self to be used in register_tool.
Also, add test for raw identifier and unicode identifiers.
This adds back the previously existing duplicate tool error, but as a
suppressable lint.
This is already *supposed* to be impossible in layout, but this emphasizes that better.

Ironically I was inspired to do this as part of looking at making `Simd<T, 0>` *work*, but importantly if that's going to happen I think it should be `BackendRepr::Memory` like other ZSTs, *not* a `BackendRepr::ScalarVector` that would need to carry around a useless LLVM value in `OperandValue::Immediate` (where it's not even clear what the LLVM type of that value would be).
* docs: document the non_exhaustive attribute
* Add newline at end of attribute_docs.rs
* Update library/core/src/attribute_docs.rs

* Update library/core/src/attribute_docs.rs

Co-authored-by: Guillaume Gomez <contact@guillaume-gomez.fr>
Co-authored-by: Krisitan Erik Olsen <kristian.erik@outlook.com>
* fundamental only on first arg
* woo this made error messages nicer
* oh the test was misnamed lol
* special case only box
* rename tests

Co-authored-by: Nia Deckers <nia-e@haecceity.cc>
Instead of displaying all kind of tuples that implement a given trait, which
might flood the user, it displays a concise message only when all the involved
types are tuples.
…aethlin

Drop elaboration: Only create a reset block if there are flags to reset.

Follow-up to rust-lang#157491

I'm not totally convinced this is worth the effort. The generated pattern is trivially cleaned-up by SimplifyCfg, so we should not need to bother.

r? @saethlin since you reviewed the earlier PR
…-5, r=saethlin

Emit retags in codegen to support BorrowSanitizer (part 5)

Tracking issue: rust-lang#154760
[Zulip Thread](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Staging.20for.20emitting.20retags.20in.20codegen/with/592364811)

This is one of several PRs that add experimental support for emitting retags as function calls in codegen.

This PR adds support for emitting global arrays that specify the ranges of interior mutable and pinned data. For example,
```rust
fn cell(x: &(i32, Cell<i32>)) { ... }
```
This program will have IR similar to the following:
```llvm
@anon.0 = unnamed_addr constant [16 x i8] c"\04...\04..."
define void @cell(ptr %0)  {
start:
  %x = call ptr @__rust_retag_reg(ptr %0, i64 8, i8 1, ptr @anon.0, ptr null)
  ...
}
```
The last four bytes at offset four are interior mutable.

Users can disable this behavior by passing `no-precise-im` or `no-precise-pin` as options to  `-Zcodegen-emit-retag`. In that case, the last two parameters to the retag intrinsic will always be null pointers.

BorrowSanitizer will be able to switch to using nightly once this is merged. Thank you @saethlin for reviewing these PRs!

Note: we still do not support retagging SIMD types, since cg-ssa does not support `insertelement`.

Related: rust-lang#158100

Cc: @RalfJung
r? @saethlin
…overflow, r=JohnTitor

Report "capacity overflow" for oversized Rc<[T]>/Arc<[T]>

Fixes rust-lang#136797.

Building an Rc<[T]>/Arc<[T]> whose header + payload layout exceeds
isize::MAX unwrapped a LayoutError and panicked with "called
Result::unwrap() on an Err value: LayoutError". Vec and Box report
"capacity overflow" here; this makes Rc/Arc do the same.

Used an inline panic!("capacity overflow") rather than raw_vec's
capacity_overflow(), since that helper is cfg'd out under
no_global_oom_handling while these two layout fns still compile there.
make atomic operations const

In a similar vein to rust-lang#159094, it makes sense to make these `const fn` so that code can be shared between compile-time and run-time even if the runtime version has to deal with concurrency.

This constifies the following:
```rust
// core::sync::atomic

impl AtomicBool {
    pub const fn get_mut(&mut self) -> &mut bool;
    pub const fn from_mut(v: &mut bool) -> &mut Self;
    pub const fn get_mut_slice(this: &mut [Self]) -> &mut [bool];
    pub const fn from_mut_slice(v: &mut [bool]) -> &mut [Self];
    pub const fn load(&self, order: Ordering) -> bool;
    pub const fn store(&self, val: bool, order: Ordering);
    pub const fn swap(&self, val: bool, order: Ordering) -> bool;
    pub const fn compare_and_swap(&self, current: bool, new: bool, order: Ordering) -> bool;
    pub const fn compare_exchange(
        &self,
        current: bool,
        new: bool,
        success: Ordering,
        failure: Ordering,
    ) -> Result<bool, bool>;
    pub const fn compare_exchange_weak(
        &self,
        current: bool,
        new: bool,
        success: Ordering,
        failure: Ordering,
    ) -> Result<bool, bool>;
    pub const fn fetch_and(&self, val: bool, order: Ordering) -> bool;
    pub const fn fetch_nand(&self, val: bool, order: Ordering) -> bool;
    pub const fn fetch_or(&self, val: bool, order: Ordering) -> bool;
    pub const fn fetch_xor(&self, val: bool, order: Ordering) -> bool;
    pub const fn fetch_not(&self, order: Ordering) -> bool;
}

impl AtomicPtr<T> {
    pub const fn get_mut(&mut self) -> &mut *mut T;
    pub const fn from_mut(v: &mut *mut T) -> &mut Self;
    pub const fn get_mut_slice(this: &mut [Self]) -> &mut [*mut T];
    pub const fn from_mut_slice(v: &mut [*mut T]) -> &mut [Self];
    pub const fn load(&self, order: Ordering) -> *mut T;
    pub const fn store(&self, ptr: *mut T, order: Ordering);
    pub const fn swap(&self, ptr: *mut T, order: Ordering) -> *mut T;
}

impl Atomic$Int {
    pub const fn get_mut(&mut self) -> &mut $int_type;
    pub const fn from_mut(v: &mut $int_type) -> &mut Self;
    pub const fn get_mut_slice(this: &mut [Self]) -> &mut [$int_type];
    pub const fn from_mut_slice(v: &mut [$int_type]) -> &mut [Self];
    pub const fn load(&self, order: Ordering) -> $int_type;
    pub const fn store(&self, val: $int_type, order: Ordering);
    pub const fn swap(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn compare_and_swap(&self,
                                    current: $int_type,
                                    new: $int_type,
                                    order: Ordering) -> $int_type;
    pub const fn compare_exchange(&self,
                                    current: $int_type,
                                    new: $int_type,
                                    success: Ordering,
                                    failure: Ordering) -> Result<$int_type, $int_type>;
    pub const fn compare_exchange_weak(&self,
                                         current: $int_type,
                                         new: $int_type,
                                         success: Ordering,
                                         failure: Ordering) -> Result<$int_type, $int_type>;
    pub const fn fetch_add(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_sub(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_and(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_nand(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_or(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_xor(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_max(&self, val: $int_type, order: Ordering) -> $int_type;
    pub const fn fetch_min(&self, val: $int_type, order: Ordering) -> $int_type;
}

pub const fn fence(order: Ordering);
pub const fn compiler_fence(order: Ordering);
```

However, this excludes the `fetch_*` and `compare_*` operations on `AtomicPtr`, as that kind of pointer arithmetic is not possible at compile time.

Tracking issue: rust-lang#160078
Cc @rust-lang/wg-const-eval @rust-lang/opsem
Structurally prevent zero-count `BackendRepr::SimdVector`s

This is already *supposed* to be impossible in layout, but this emphasizes that better.  This PR makes no behaviour changes; just `BackendLaneCount` instead of `u64` in https://doc.rust-lang.org/nightly/nightly-rustc/rustc_abi/enum.BackendRepr.html

Ironically I was inspired to do this as part of [looking at making `Simd<T, 0>` *work*](https://rust-lang.zulipchat.com/#narrow/channel/257879-project-portable-simd/topic/Allow.20N.3D.3D0.3F/with/613345298), but importantly if that's going to happen I think it should be `BackendRepr::Memory` like other ZSTs, *not* a `BackendRepr::ScalarVector` that would need to carry around a useless LLVM value in `OperandValue::Immediate` (where it's not even clear what the LLVM type of that value would be).
Make `#[fundamental]` only apply to the first argument of `Box`

Per a [discussion with lang](https://rust-lang.zulipchat.com/#narrow/channel/213817-t-lang/topic/.60.23.5Bfundamental.5D.60.20and.20.60Box.3CT.2C.20A.3E.60/with/613236766), it was decided that we want `Box<T, A>` to only be fundamental in `T`. ~~Given that `Box` is the only fundamental type with two generic params, simply make it so only the first param is considered for fundamentalness.~~ ~~`Tuple` is also fundamental, but has its own path in coherence checking and so isn't impacted by this; `Box` is the only thing that is.~~

Since this is just an internal detail and `#[fundamental]` is not in a rush to get stabilised, lang's opinion was that t-compiler has free rein on how to implement this so I figured I'd go with the most straightforward implementation for now. The main alternative I see would be supporting param-position `#[fundamental]` & have the semantics that:
```rust
#[fundamental]
struct Foo<T, U>(T, U);
```
is equivalent to
```rust
struct Foo<#[fundamental] T, #[fundamental] U>(T, U);
```
though given that there's no usecase for this right now, it seemed somewhat unnecessary.

r? compiler
Remove an outdated FIXME

This FIXME was added in rust-lang#78923, at which point there were 8 arguments. Now there are only 5, which is much more reasonable.

This commit was brought to you by https://oli-obk.github.io/fixmeh/.
…rochenkov

Improve diagnostic for patterns in function pointer types

In preparation for some work for rust-lang#158499

Diagnostic before:
```
error[E0642]: patterns aren't allowed in methods without bodies
  --> $DIR/fn-ptr-pattern.rs:4:14
   |
LL |     pat2: fn(1..3: bool),
   |              ^^^^
   |
help: give this argument a name or use an underscore to ignore it
   |
LL -     pat2: fn(1..3: bool),
LL +     pat2: fn(_: bool),
   |
```
Diagnostic after:
```
error[E0642]: patterns aren't allowed in function pointer types
  --> $DIR/fn-ptr-pattern.rs:4:14
   |
LL |     pat2: fn(1..3: bool),
   |              ^^^^
   |
help: give this argument a name or use an underscore to ignore it
   |
LL -     pat2: fn(1..3: bool),
LL +     pat2: fn(_: bool),
   |
```
Eagerly fetch typeck results when linting

The first commit avoids running the lint visitor if all lints were filtered out. In every other case the typeck results are accessed on every body making the delayed load pointless overhead.
jhpratt added 6 commits July 31, 2026 22:22
…it_impls_tuples, r=mejrs

Improve suggestions when multiples tuples implement the same trait

Fixes rust-lang#152903
…ttribute, r=GuillaumeGomez

Add documentation for the `non_exhaustive` attribute

Document the built-in `non_exhaustive` attribute using the `#[doc(attribute = "…")]` mechanism.

Part of rust-lang#157604

Tested with `./x test library/std --doc --test-args attribute_docs`.

r? @GuillaumeGomez
Fix `hidden_glob_reexports` in `rustc_ast`

See rust-lang#159901 for why the downstream changes are necessary
Align expect messages with guidance

Issue: rust-lang#159751

- Changed 3 `expect` messages and some relevant comments in `library/core/src/result.rs` and `library/core/src/primitive_docs.rs`

- I intentionally left the below snippet unchanged in `library/core/src/result.rs`.
The example is quite minimal and focuses on showing the panic output format, so I thought it was better to keep the message short and simple.
```
    /// # Panics
    ///
    /// Panics if the value is an [`Err`], with a panic message including the
    /// passed message, and the content of the [`Err`].
    ///
    ///
    /// # Examples
    ///
    /// ```should_panic
    /// let x: Result<u32, &str> = Err("emergency failure");
    /// x.expect("Testing expect"); // panics with `Testing expect: emergency failure`
    /// ```
```

r? @fee1-dead
Expand checks for register_tool

Follow up to rust-lang#158038 (review) and rust-lang#158038 (comment)

* Add tool-attribute test to ensure tools are not preserved across crate
* Reject invalid identifiers (super/self/Self/crate) in register_tool
* Add lint for duplicate tools

r? @mejrs
…GuillaumeGomez

Update `minifier` version to `0.4.0`

Contains security fix added by @Eh2406 done in GuillaumeGomez/minifier-rs#130.

r? ghost
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 1, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 1, 2026
@jhpratt jhpratt closed this Aug 1, 2026
@rust-bors

rust-bors Bot commented Aug 1, 2026

Copy link
Copy Markdown
Contributor

PR #159195, which is a member of this rollup, was unapproved.

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 1, 2026
@jhpratt
jhpratt deleted the rollup-Ef2gOQQ branch August 1, 2026 02:24
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [mir-opt] tests/mir-opt/unusual_item_types.rs ... ok

failures:

---- [mir-opt] tests/mir-opt/coroutine/async_drop.rs stdout ----
65 +         _26 = std::future::ResumeTy(move _27);
66 +         _25 = copy (_1.0: &mut {async fn body of array()});
67 +         _24 = discriminant((*_25));
- +         switchInt(move _24) -> [0: bb26, 1: bb25, 2: bb24, 3: bb22, 4: bb23, otherwise: bb11];
+ +         switchInt(move _24) -> [0: bb25, 1: bb24, 2: bb23, 3: bb21, 4: bb22, otherwise: bb11];
69       }
70   
71       bb1: {

85 -         StorageDead(_3);
86 -         drop(_1) -> [return: bb4, unwind: bb8];
87 +         nop;
- +         goto -> bb20;
+ +         goto -> bb4;
89       }
90   
91       bb4: {

104 -     bb6: {
---
108       }
109   
110 -     bb7 (cleanup): {

201 +         _21 = Pin::<&mut [AsyncInt; 2]>::new_unchecked(move _22) -> [return: bb18, unwind: bb5];
202       }
203   
-       bb20: {
+ -     bb20: {
205 -         _13 = &mut _6;
206 -         _10 = Pin::<&mut impl Future<Output = ()>>::new_unchecked(move _13) -> [return: bb19, unwind: bb11];
- +         goto -> bb4;
+ +     bb20 (cleanup): {
+ +         discriminant((*_25)) = 2;
+ +         resume;
208       }
209   
- -     bb21: {
+       bb21: {
211 -         _2 = move _14;
212 -         StorageDead(_14);
213 -         goto -> bb27;

- +     bb21 (cleanup): {
- +         discriminant((*_25)) = 2;
- +         resume;
+ +         StorageLive(_7);
+ +         _7 = move _26;
+ +         goto -> bb10;
217       }
218   
219       bb22: {

220 -         _2 = move _14;
---
227   
228       bb23: {

-           StorageLive(_14);
+ -         StorageLive(_14);
230 -         _14 = yield(const ()) -> [resume: bb21, drop: bb22];
- +         _14 = move _26;
- +         goto -> bb12;
+ +         assert(const false, "`async fn` resumed after panicking") -> [success: bb23, unwind continue];
233       }
234   
235       bb24: {

236 -         _16 = discriminant(_15);
237 -         switchInt(move _16) -> [0: bb9, 1: bb23, otherwise: bb16];
- +         assert(const false, "`async fn` resumed after panicking") -> [success: bb24, unwind continue];
+ +         assert(const false, "`async fn` resumed after completion") -> [success: bb24, unwind continue];
239       }
240   
241       bb25: {

242 -         _15 = <impl Future<Output = ()> as Future>::poll(move _17, move _18) -> [return: bb24, unwind: bb11];
- +         assert(const false, "`async fn` resumed after completion") -> [success: bb25, unwind continue];
-       }
-   
-       bb26: {
+ -     }
+ - 
+ -     bb26: {
247 -         _19 = move _2;
248 -         _18 = std::future::get_context::<'_, '_>(move _19) -> [return: bb25, unwind: bb11];
249 -     }


thread '[mir-opt] tests/mir-opt/coroutine/async_drop.rs' panicked at src/tools/compiletest/src/runtest/mir_opt.rs:73:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/coroutine/async_drop.array-{closure#0}.StateTransform.diff
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---- [mir-opt] tests/mir-opt/coroutine/async_drop.rs stdout end ----

failures:
    [mir-opt] tests/mir-opt/coroutine/async_drop.rs

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

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. rollup A PR which is a rollup T-clippy Relevant to the Clippy team. 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. 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.