Rollup of 11 pull requests #150220

matthiaskrgr · 2025-12-21T10:41:39Z

Successful merges:

Don't strip shebang in expr-ctxt include!(…) #146377 (Don't strip shebang in expr-ctxt include!(…))
tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test #149658 (tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test)
Add const default for OnceCell and OnceLock #149812 (Add const default for OnceCell and OnceLock)
miri: add -Zbinary-dep-depinfo to dependency builds #149882 (miri: add -Zbinary-dep-depinfo to dependency builds)
Enable llvm-libunwind by default for Hexagon targets #150009 (Enable llvm-libunwind by default for Hexagon targets)
fix docustring on fetch_or #150035 (fix docustring on fetch_or)
tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case #150082 (tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case)
Fix ICE (#149980) for invalid EII in statement position #150160 (Fix ICE (ICE: eii on impl: expected statement #149980) for invalid EII in statement position)
mir_build: Use the same length type for TestableCase::Slice and TestKind::Len #150184 (mir_build: Use the same length type for TestableCase::Slice and TestKind::Len)
change non-canonical clone impl to {*self}, fix some doc comments #150191 (change non-canonical clone impl to {*self}, fix some doc comments)
Drop the From derive macro from the v1 prelude #150203 (Drop the From derive macro from the v1 prelude)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: tison <wander4096@gmail.com>

Fixes library linking issues where libgcc_s was incorrectly being linked instead of the appropriate LLVM runtime libraries for Hexagon targets. * Set llvm-libunwind as default for all hexagon targets in bootstrap * Exclude hexagon from automatic libgcc_s linking in unwind * Enable libunwind.a copying for hexagon targets * Remove manual library linking from hexagon target specification

If we convert the minimum length to `u64` up-front when creating `TestableCase::Slice`, we can avoid more conversions to `u64` later.

This was accidentally added to the prelude in 3f4dc1e.

Don't strip shebang in expr-ctxt `include!(…)` No longer strip shebang interpreter directives in files that were `include`d in expression (statement) contexts.

…acrum tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test Closes rust-lang#60044 which has one 👍 and one ❤️ vote and just **E-needs-test**.

…=Mark-Simulacrum Add const default for OnceCell and OnceLock cc rust-lang#143894

…mulacrum miri: add -Zbinary-dep-depinfo to dependency builds Hopefully fixes rust-lang#149711 Cc ``@bjorn3``

…-Simulacrum Enable llvm-libunwind by default for Hexagon targets Fixes library linking issues where libgcc_s was incorrectly being linked instead of the appropriate LLVM runtime libraries for Hexagon targets. * Set llvm-libunwind as default for all hexagon targets in bootstrap * Exclude hexagon from automatic libgcc_s linking in unwind * Enable libunwind.a copying for hexagon targets * Remove manual library linking from hexagon target specification

fix docustring on fetch_or The documentation had the same example twice in a row, but I think this was the intended second example.

tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case Closes rust-lang#50280 which just **E-needs-test**. See rust-lang#50280 (comment) for a bisect of the fix. The issue description is quite vague, so in the test I am linking directly to the most descriptive comment rust-lang#50280 (comment).

Fix ICE (rust-lang#149980) for invalid EII in statement position Based on rust-lang#150159 Fixes rust-lang#149980

mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len` If we convert the minimum length to `u64` up-front when creating `TestableCase::Slice`, we can avoid more conversions to `u64` later. There should be no change to compiler behaviour.

change non-canonical clone impl to {*self}, fix some doc comments

…om-prelude, r=jdonszelmann Drop the From derive macro from the v1 prelude This was accidentally added to the prelude in 3f4dc1e. Fixes: rust-lang#150165 r? ```@jdonszelmann```

matthiaskrgr · 2025-12-21T10:41:51Z

@bors r+ rollup=never p=5

bors · 2025-12-21T10:41:54Z

📌 Commit 1be219d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-12-21T13:48:53Z

⌛ Testing commit 1be219d with merge 89c3a84...

Rollup of 11 pull requests Successful merges: - #146377 (Don't strip shebang in expr-ctxt `include!(…)`) - #149658 (tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test) - #149812 (Add const default for OnceCell and OnceLock) - #149882 (miri: add -Zbinary-dep-depinfo to dependency builds) - #150009 (Enable llvm-libunwind by default for Hexagon targets) - #150035 (fix docustring on fetch_or) - #150082 (tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case) - #150160 (Fix ICE (#149980) for invalid EII in statement position) - #150184 (mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`) - #150191 (change non-canonical clone impl to {*self}, fix some doc comments) - #150203 (Drop the From derive macro from the v1 prelude) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-12-21T14:20:53Z

The job x86_64-gnu-llvm-20-3 failed! Check out the build log: (web) (plain enhanced) (plain)

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


---- [assembly] tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs stdout ----
------FileCheck stdout------------------------------

------FileCheck stderr------------------------------
/checkout/tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs:38:15: error: CHECK-DAG: expected string not found in input
// CHECK-DAG: some_non_zero_from_atomic_get2 = some_non_zero_from_atomic_get
              ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s:9:6: note: scanning from here
 retq
     ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s:23:6: note: possible intended match here
.set some_non_zero_from_atomic_get2, some_non_zero_from_atomic_get
     ^

Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s
Check file: /checkout/tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs

-dump-input=help explains the following input dump.

Input was:
<<<<<<
          1:  .file "some_non_zero_from_atomic_optimization.dd00b9cfc89e3fb0-cgu.0" 
          2:  .section .text.some_non_zero_from_atomic_get,"ax",@progbits 
          3:  .globl some_non_zero_from_atomic_get 
          4:  .p2align 4 
          5:  .type some_non_zero_from_atomic_get,@function 
          6: some_non_zero_from_atomic_get: 
          7:  movq _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X@GOTPCREL(%rip), %rax 
          8:  movq (%rax), %rax 
          9:  retq 
dag:38'0          X error: no match found
         10: .Lfunc_end0: 
dag:38'0     ~~~~~~~~~~~~~
         11:  .size some_non_zero_from_atomic_get, .Lfunc_end0-some_non_zero_from_atomic_get 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         12:  
dag:38'0     ~
         13:  .type _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X,@object 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         14:  .section .data._RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X,"aw",@progbits 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         15:  .globl _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         16:  .p2align 3, 0x0 
dag:38'0     ~~~~~~~~~~~~~~~~~
         17: _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X: 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         18:  .asciz "\001\000\000\000\000\000\000" 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         19:  .size _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X, 8 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         20:  
dag:38'0     ~
         21:  .globl some_non_zero_from_atomic_get2 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         22:  .type some_non_zero_from_atomic_get2,@function 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         23: .set some_non_zero_from_atomic_get2, some_non_zero_from_atomic_get 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dag:38'1          ?                                                              possible intended match
         24:  .ident "rustc version 1.94.0-nightly (89c3a8487 2025-12-21)" 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         25:  .section ".note.GNU-stack","",@progbits 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>

------------------------------------------

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/usr/lib/llvm-20/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s" "/checkout/tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs" "--check-prefix=CHECK" "--allow-unused-prefixes" "--dump-input-context" "100"
stdout: none
--- stderr -------------------------------
/checkout/tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs:38:15: error: CHECK-DAG: expected string not found in input
// CHECK-DAG: some_non_zero_from_atomic_get2 = some_non_zero_from_atomic_get
              ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s:9:6: note: scanning from here
 retq
     ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s:23:6: note: possible intended match here
.set some_non_zero_from_atomic_get2, some_non_zero_from_atomic_get
     ^

Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/assembly-llvm/some-non-zero-from-atomic-optimization/some-non-zero-from-atomic-optimization.s
Check file: /checkout/tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs

-dump-input=help explains the following input dump.

Input was:
<<<<<<
          1:  .file "some_non_zero_from_atomic_optimization.dd00b9cfc89e3fb0-cgu.0" 
          2:  .section .text.some_non_zero_from_atomic_get,"ax",@progbits 
          3:  .globl some_non_zero_from_atomic_get 
          4:  .p2align 4 
          5:  .type some_non_zero_from_atomic_get,@function 
          6: some_non_zero_from_atomic_get: 
          7:  movq _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X@GOTPCREL(%rip), %rax 
          8:  movq (%rax), %rax 
          9:  retq 
dag:38'0          X error: no match found
         10: .Lfunc_end0: 
dag:38'0     ~~~~~~~~~~~~~
         11:  .size some_non_zero_from_atomic_get, .Lfunc_end0-some_non_zero_from_atomic_get 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         12:  
dag:38'0     ~
         13:  .type _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X,@object 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         14:  .section .data._RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X,"aw",@progbits 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         15:  .globl _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         16:  .p2align 3, 0x0 
dag:38'0     ~~~~~~~~~~~~~~~~~
         17: _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X: 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         18:  .asciz "\001\000\000\000\000\000\000" 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         19:  .size _RNvCsiYomkyV1XmC_38some_non_zero_from_atomic_optimization1X, 8 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         20:  
dag:38'0     ~
         21:  .globl some_non_zero_from_atomic_get2 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         22:  .type some_non_zero_from_atomic_get2,@function 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         23: .set some_non_zero_from_atomic_get2, some_non_zero_from_atomic_get 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dag:38'1          ?                                                              possible intended match
         24:  .ident "rustc version 1.94.0-nightly (89c3a8487 2025-12-21)" 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         25:  .section ".note.GNU-stack","",@progbits 
dag:38'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>
------------------------------------------

---- [assembly] tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs stdout end ----

failures:
    [assembly] tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs

test result: FAILED. 554 passed; 1 failed; 46 ignored; 0 measured; 0 filtered out; finished in 19.79s

bors · 2025-12-21T14:21:41Z

💔 Test failed - checks-actions

fmease and others added 23 commits November 26, 2025 04:57

Don't strip shebang in expr-ctxt include!(…)

e477732

tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test

faf06cc

Add const default for OnceCell and OnceLock

df38e15

Signed-off-by: tison <wander4096@gmail.com>

miri: add -Zbinary-dep-depinfo to dependency builds

0428dd5

fix docustring on fetch_or

3493f8c

add test for 149980

897e88c

refactor how eii expansion is wrapped fixing 149980

c316c05

Use the same length type for TestableCase::Slice and TestKind::Len

19f74f4

If we convert the minimum length to `u64` up-front when creating `TestableCase::Slice`, we can avoid more conversions to `u64` later.

change non-canonical clone impl to {*self}, fix some doc comments

5d8a096

Drop the From derive macro from the v1 prelude

93fbf3b

This was accidentally added to the prelude in 3f4dc1e.

library/coretests/tests/fmt/mod.rs: Add HRTB fn pointer case

8825e1f

Rollup merge of rust-lang#146377 - fmease:no-incl-shebang-expr, r=Urgau

277362e

Don't strip shebang in expr-ctxt `include!(…)` No longer strip shebang interpreter directives in files that were `include`d in expression (statement) contexts.

Rollup merge of rust-lang#149658 - Enselic:non-zero-opt, r=Mark-Simul…

99d1cab

…acrum tests/assembly-llvm/some-non-zero-from-atomic-optimization.rs: New test Closes rust-lang#60044 which has one 👍 and one ❤️ vote and just **E-needs-test**.

Rollup merge of rust-lang#149812 - tisonkun:oncelock-const-default, r…

e77fdf2

…=Mark-Simulacrum Add const default for OnceCell and OnceLock cc rust-lang#143894

Rollup merge of rust-lang#149882 - RalfJung:miri-dep-build, r=Mark-Si…

d0fa6f3

…mulacrum miri: add -Zbinary-dep-depinfo to dependency builds Hopefully fixes rust-lang#149711 Cc ``@bjorn3``

Rollup merge of rust-lang#150035 - agavra:patch-1, r=Mark-Simulacrum

ea30b02

fix docustring on fetch_or The documentation had the same example twice in a row, but I think this was the intended second example.

Rollup merge of rust-lang#150160 - jdonszelmann:fix-149980, r=Kivooeo

7f3efbf

Fix ICE (rust-lang#149980) for invalid EII in statement position Based on rust-lang#150159 Fixes rust-lang#149980

Rollup merge of rust-lang#150191 - hkBst:clippy-fix-15, r=Kivooeo

cabf8d8

change non-canonical clone impl to {*self}, fix some doc comments

Rollup merge of rust-lang#150203 - jtgeibel:drop-From-derive-macro-fr…

1be219d

…om-prelude, r=jdonszelmann Drop the From derive macro from the v1 prelude This was accidentally added to the prelude in 3f4dc1e. Fixes: rust-lang#150165 r? ```@jdonszelmann```

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 Dec 21, 2025

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 21, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 11 pull requests #150220

Rollup of 11 pull requests #150220

Uh oh!

matthiaskrgr commented Dec 21, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

rust-log-analyzer commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Rollup of 11 pull requests #150220

Are you sure you want to change the base?

Rollup of 11 pull requests #150220

Uh oh!

Conversation

matthiaskrgr commented Dec 21, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

rust-log-analyzer commented Dec 21, 2025

Uh oh!

bors commented Dec 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

matthiaskrgr commented Dec 21, 2025 •

edited by rustbot

Loading