Rollup of 16 pull requests #144418

fmease · 2025-07-24T20:40:08Z

Successful merges:

Suggest clone in user-write-code instead of inside macro #142569 (Suggest clone in user-write-code instead of inside macro)
tests: Don't check for self-printed output in std-backtrace.rs test #143401 (tests: Don't check for self-printed output in std-backtrace.rs test)
clippy fix: rely on autoderef #143424 (clippy fix: rely on autoderef)
Update core::mem::copy documentation #143970 (Update core::mem::copy documentation)
Test fixes for Arm64EC Windows #143979 (Test fixes for Arm64EC Windows)
tests: debuginfo: Work around or disable broken tests on powerpc #144160 (tests: debuginfo: Work around or disable broken tests on powerpc)
Tweak output for non-Clone values moved into closures #144200 (Tweak output for non-Clone values moved into closures)
Don't emit two assumes in transmutes when one is a subset of the other #144209 (Don't emit two assumes in transmutes when one is a subset of the other)
Don't special-case llvm.* as nounwind #144225 (Don't special-case llvm.* as nounwind)
Hint that choose_pivot returns index in bounds #144314 (Hint that choose_pivot returns index in bounds)
bootstrap: Move musl-root fallback out of sanity check #144316 (bootstrap: Move musl-root fallback out of sanity check)
Update dlmalloc dependency of libstd #144364 (Update dlmalloc dependency of libstd)
resolve: Remove Scope::CrateRoot #144368 (resolve: Remove Scope::CrateRoot)
remove deprecated Error::description in impls #144373 (remove deprecated Error::description in impls)
Remove dead code and extend test coverage and diagnostics around it #144390 (Remove dead code and extend test coverage and diagnostics around it)
rustc_public: Remove movability from RigidTy/AggregateKind::Coroutine #144392 (rustc_public: Remove movability from RigidTy/AggregateKind::Coroutine)

r? @ghost
@rustbot modify labels: rollup

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

The `Display` implementation for `Backtrace` used to print stack backtrace: but that print was later removed. To make the existing test pass, the print was added to the existing test. But it doesn't make sense to check for something that the test itself does since that will not detect any regressions in the implementation of `Backtrace`. Fully remove the checks.

… fn signature

f16 support for PowerPC has issues in LLVM, therefore we need a small workaround to prevent LLVM from emitting symbols that don't exist for PowerPC yet. It also appears that unused by-value non-immedate issue with gdb applies to PowerPC targets as well, though I've only tested 64-bit Linux targets. Signed-off-by: Jens Reidel <[email protected]>

When encountering a non-`Copy` value that is moved into a closure which is coming directly from a fn parameter, point at the parameter's type when mentioning it is not `Copy`. Before: ``` error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure --> f111.rs:14:25 | 13 | fn do_stuff(foo: Option<Foo>) { | --- captured outer variable 14 | require_fn_trait(|| async { | -- ^^^^^ `foo` is moved here | | | captured by this `Fn` closure 15 | if foo.map_or(false, |f| f.foo()) { | --- | | | variable moved due to use in coroutine | move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait ``` After: ``` error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure --> f111.rs:14:25 | 13 | fn do_stuff(foo: Option<Foo>) { | --- ----------- move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait | | | captured outer variable 14 | require_fn_trait(|| async { | -- ^^^^^ `foo` is moved here | | | captured by this `Fn` closure 15 | if foo.map_or(false, |f| f.foo()) { | --- variable moved due to use in coroutine ```

Account not only for `fn` parameters when moving non-`Copy` values into closure, but also for let bindings. ``` error[E0507]: cannot move out of `bar`, a captured variable in an `FnMut` closure --> $DIR/borrowck-move-by-capture.rs:9:29 | LL | let bar: Box<_> = Box::new(3); | --- ------ move occurs because `bar` has type `Box<isize>`, which does not implement the `Copy` trait | | | captured outer variable LL | let _g = to_fn_mut(|| { | -- captured by this `FnMut` closure LL | let _h = to_fn_once(move || -> isize { *bar }); | ^^^^^^^^^^^^^^^^ ---- variable moved due to use in closure | | | `bar` is moved here | help: consider cloning the value before moving it into the closure | LL ~ let value = bar.clone(); LL ~ let _h = to_fn_once(move || -> isize { value }); | ``` ``` error[E0507]: cannot move out of `y`, a captured variable in an `Fn` closure --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:12:9 | LL | let y = vec![format!("World")]; | - ---------------------- move occurs because `y` has type `Vec<String>`, which does not implement the `Copy` trait | | | captured outer variable LL | call(|| { | -- captured by this `Fn` closure LL | y.into_iter(); | ^ ----------- `y` moved due to this method call | | | `y` is moved here | note: `into_iter` takes ownership of the receiver `self`, which moves `y` --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL help: you can `clone` the value and consume it, but this might not be your desired behavior | LL | <Vec<String> as Clone>::clone(&y).into_iter(); | +++++++++++++++++++++++++++++++ + help: consider cloning the value if the performance cost is acceptable | LL | y.clone().into_iter(); | ++++++++ ```

``` error[E0507]: cannot move out of `f`, a captured variable in an `FnMut` closure --> $DIR/borrowck-call-is-borrow-issue-12224.rs:57:13 | LL | let mut f = move |g: Box<dyn FnMut(isize)>, b: isize| { | ----- captured outer variable ... LL | f(Box::new(|a| { | --- captured by this `FnMut` closure LL | LL | foo(f); | ^ move occurs because `f` has type `{closure@$DIR/borrowck-call-is-borrow-issue-12224.rs:52:17: 52:58}`, which does not implement the `Copy` trait ``` instead of ``` error[E0507]: cannot move out of `f`, a captured variable in an `FnMut` closure --> $DIR/borrowck-call-is-borrow-issue-12224.rs:57:13 | LL | let mut f = move |g: Box<dyn FnMut(isize)>, b: isize| { | _________-----___- | | | | | captured outer variable LL | | let _ = s.len(); LL | | }; | |_____- move occurs because `f` has type `{closure@$DIR/borrowck-call-is-borrow-issue-12224.rs:52:17: 52:58}`, which does not implement the `Copy` trait LL | f(Box::new(|a| { | --- captured by this `FnMut` closure LL | LL | foo(f); | ^ `f` is moved here ```

Signed-off-by: Jens Reidel <[email protected]>

Previously, the musl root would only be set to the fallback /usr by the sanity check, which isn't ran for the bootstrap tests. Signed-off-by: Jens Reidel <[email protected]>

Certain LLVM intrinsics, such as `llvm.wasm.throw`, can unwind. Marking them as nounwind causes us to skip cleanup of locals and optimize out `catch_unwind` under inlining or when `llvm.wasm.throw` is used directly by user code. The motivation for forcibly marking llvm.* as nounwind is no longer present: most intrinsics are linked as `extern "C"` or other non-unwinding ABIs, so we won't codegen `invoke` for them anyway.

This primarily pulls in alexcrichton/dlmalloc-rs/55 and alexcrichton/dlmalloc-rs/54 to address 144199. Notably the highest byte in the wasm address space is no longer allocatable and additionally the allocator internally uses `wrapping_add` instead of `add` on pointers since on 32-bit platforms offsets might be larger than half the address space.

…ures

For example, transmuting between `bool` and `Ordering` doesn't need two `assume`s because one range is a superset of the other. Multiple are still used for things like `char` <-> `NonZero<u32>`, which overlap but where neither fully contains the other.

Signed-off-by: Jens Reidel <[email protected]>

We lost the following comment during refactorings: The current code for niche-filling relies on variant indices instead of actual discriminants, so enums with explicit discriminants (RFC 2363) would misbehave.

…tine`

Use `Scope::Module` with the crate root module inside instead, which should be identical.

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? `@fmease`

…n-display, r=davidtwco tests: Don't check for self-printed output in std-backtrace.rs test The `Display` implementation for `Backtrace` used to print stack backtrace: but that print was since removed. See rust-lang/backtrace-rs#286 and rust-lang#69042. To make the existing test pass, the print was added to the test instead. But it doesn't make sense to check for something that the test itself does since that will not detect any regressions in the implementation of `Backtrace`. What the test _should_ check is that "stack backtrace:" is _not_ printed in `Display` of `Backtrace`. So do that instead. This is one small steps towards resolving rust-lang#71706. The next steps after this step involves extending and hardening that test further.

clippy fix: rely on autoderef Changes instances of `&**self` to `self`.

… r=scottmcm Update core::mem::copy documentation Update the documentation of `core::mem::copy` to include a `const` on the definition of the function.

…nkov Test fixes for Arm64EC Windows * `tests/ui/cfg/conditional-compile-arch.rs` needs an Arm64EC case. * `tests/ui/runtime/backtrace-debuginfo.rs` should skip Arm64EC as it suffers from the same truncated backtraces as Arm64 Windows. * `tests/ui/linkage-attr/incompatible-flavor.rs` is a general issue: it assumes that the Rust compiler is always built with the x86 target enabled in the backend, but I only enabled AArch64 when building locally to speed up the LLVM compilation.

…li-obk tests: debuginfo: Work around or disable broken tests on powerpc f16 support for PowerPC has issues in LLVM, therefore we need a small workaround to prevent LLVM from emitting symbols that don't exist for PowerPC yet. It also appears that rust-lang#128973 applies to PowerPC targets as well, though I've only tested 64-bit Linux targets.

…lcnr Tweak output for non-`Clone` values moved into closures When we encounter a non-`Clone` value being moved into a closure, try to find the corresponding type of the binding being moved, if it is a `let`-binding or a function parameter. If any of those cases, we point at them with the note explaining that the type is not `Copy`, instead of giving that label to the place where it is captured. When it is a `let`-binding with no explicit type, we point at the initializer (if it fits in a single line). ``` error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure --> f111.rs:14:25 | 13 | fn do_stuff(foo: Option<Foo>) { | --- ----------- move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait | | | captured outer variable 14 | require_fn_trait(|| async { | -- ^^^^^ `foo` is moved here | | | captured by this `Fn` closure 15 | if foo.map_or(false, |f| f.foo()) { | --- variable moved due to use in coroutine ``` instead of ``` error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure --> f111.rs:14:25 | 13 | fn do_stuff(foo: Option<Foo>) { | --- captured outer variable 14 | require_fn_trait(|| async { | -- ^^^^^ `foo` is moved here | | | captured by this `Fn` closure 15 | if foo.map_or(false, |f| f.foo()) { | --- | | | variable moved due to use in coroutine | move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait ```

fmease · 2025-07-24T20:40:19Z

@bors r+ rollup=never p=5

bors · 2025-07-24T20:40:21Z

📌 Commit f68aaab has been approved by fmease

It is now in the queue for this repository.

fmease · 2025-07-24T20:43:19Z

Hello GH 👋, plz run CI

bors · 2025-07-24T23:49:14Z

⌛ Testing commit f68aaab with merge d0a74e1...

Rollup of 16 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144225 (Don't special-case llvm.* as nounwind) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144373 (remove deprecated Error::description in impls) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-07-25T00:44:10Z

The job dist-various-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] gimli test:false 5.277
[RUSTC-TIMING] object test:false 6.125
warning: dropping unsupported crate type `dylib` for target `x86_64-fortanix-unknown-sgx`

error[E0252]: the name `Error` is defined multiple times
 --> library/std/src/sys/pal/sgx/os.rs:3:5
  |
1 | use fortanix_sgx_abi::{Error, RESULT_SUCCESS};
  |                        ----- previous import of the type `Error` here
2 |
3 | use crate::error::Error;
  |     ^^^^^^^^^^^^^^^^^^^ `Error` reimported here
  |
  = note: `Error` must be defined only once in the type namespace of this module
help: you can use `as` to change the binding name of the import
  |
3 | use crate::error::Error as OtherError;
  |                         +++++++++++++

error[E0404]: expected trait, found enum `Error`
  --> library/std/src/sys/pal/sgx/os.rs:62:6
   |
62 | impl Error for JoinPathsError {}
   |      ^^^^^ not a trait
   |
help: consider importing one of these traits instead
   |
1  + use crate::error::Error;
   |
1  + use core::error::Error;
   |

error: unused import: `crate::error::Error`
 --> library/std/src/sys/pal/sgx/os.rs:3:5
  |
3 | use crate::error::Error;
  |     ^^^^^^^^^^^^^^^^^^^
  |
  = note: `-D unused-imports` implied by `-D warnings`
  = help: to override `-D warnings` add `#[allow(unused_imports)]`

error: unused import: `str`
 --> library/std/src/sys/pal/sgx/os.rs:8:22
  |
8 | use crate::{fmt, io, str};
  |                      ^^^

Some errors have detailed explanations: E0252, E0404.

bors · 2025-07-25T00:44:47Z

💔 Test failed - checks-actions

xizheyin and others added 30 commits June 17, 2025 23:42

add test suggest-clone-in-macro-issue-139253.rs

02dac5c

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

Find correct span when suggesting using clone

fd9c1b9

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

clippy fix: rely on autoderef

b315e9a

Fixes for Arm64EC

d77c387

docs: update documentation of core::mem::copy to include const on the…

05154af

… fn signature

Reduce comment verbosity

dafc9f9

Rephrase comment to include some tracking issues

e1b6cfe

Signed-off-by: Jens Reidel <[email protected]>

bootstrap: Move musl-root fallback out of sanity check

a9fd8d0

Previously, the musl root would only be set to the fallback /usr by the sanity check, which isn't ran for the bootstrap tests. Signed-off-by: Jens Reidel <[email protected]>

Hint that choose_pivot returns index in bounds

01fdafc

Point at the type that doesn't impl Clone in more cases beyond clos…

6237e73

…ures

Clippy fixup

e7441fb

Signed-off-by: Jens Reidel <[email protected]>

remove deprecated Error::description in impls

ab6fd22

Remove dead code and extend test coverage and diagnostics around it

e44a738

We lost the following comment during refactorings: The current code for niche-filling relies on variant indices instead of actual discriminants, so enums with explicit discriminants (RFC 2363) would misbehave.

remove movability from RigidTy::Coroutine and `AggregateKind::Corou…

642deb3

…tine`

resolve: Remove Scope::CrateRoot

9ffa775

Use `Scope::Module` with the crate root module inside instead, which should be identical.

Rollup merge of rust-lang#142569 - xizheyin:139253, r=davidtwco

f73d14c

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? `@fmease`

Rollup merge of rust-lang#143424 - hkBst:auto-deref, r=jhpratt

c646816

clippy fix: rely on autoderef Changes instances of `&**self` to `self`.

Rollup merge of rust-lang#143970 - SunkenPotato:update_mem_copy_docs,…

4ab3568

… r=scottmcm Update core::mem::copy documentation Update the documentation of `core::mem::copy` to include a `const` on the definition of the function.

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

fmease closed this Jul 24, 2025

fmease reopened this Jul 24, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 24, 2025

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 25, 2025

fmease mentioned this pull request Jul 25, 2025

remove deprecated Error::description in impls #144373

Open

fmease closed this Jul 25, 2025

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2025

fmease deleted the rollup-qgs9q1t branch July 25, 2025 01:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 16 pull requests #144418

Rollup of 16 pull requests #144418

Uh oh!

fmease commented Jul 24, 2025 •

edited by rustbot

Loading

Uh oh!

fmease commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

fmease commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

rust-log-analyzer commented Jul 25, 2025

Uh oh!

bors commented Jul 25, 2025

Uh oh!

Uh oh!

Rollup of 16 pull requests #144418

Rollup of 16 pull requests #144418

Uh oh!

Conversation

fmease commented Jul 24, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmease commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

fmease commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

rust-log-analyzer commented Jul 25, 2025

Uh oh!

bors commented Jul 25, 2025

Uh oh!

Uh oh!

fmease commented Jul 24, 2025 •

edited by rustbot

Loading