Skip to content

Rollup of 6 pull requests#155166

Merged
rust-bors[bot] merged 13 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-YH2oUIz
Apr 12, 2026
Merged

Rollup of 6 pull requests#155166
rust-bors[bot] merged 13 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-YH2oUIz

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

zachs18 and others added 13 commits April 6, 2026 23:41
The recently-added test currently systematically deadlocks when running
it under i686 Windows 7, but not x86_64 that passes it fine. This
therefore fixes the test for the target.

Empirically, the correct value for `MAX_READERS` seems to be `2^28 - 1`:
removing the `- 1` re-introduces the deadlock, at least under our
testing environment. This fix thus uses this value. However, I have no
real justification to support that, because I find myself a bit at a
loss when comparing the implementation details, the comment added above
the test and what the current value is; some help would therefore be
nice in this aspect. Also, the value change is restricted to 32-bit Win7
as there is no evidence to support it should be done for other targets.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
… r=Mark-Simulacrum

Update libc to v0.2.184

This includes the WASI _SC_* sysconf constants needed for `thread::available_parallelism` on WASI targets (rust-lang#153604).
…ock-max-test, r=Mark-Simulacrum

Test(lib/sync): Fix `test_rwlock_max_readers` for x86 Win7

The test recently added in rust-lang#153555 currently systematically deadlocks when running it under i686 Windows 7, but not x86_64 that passes it fine. This therefore fixes the test for the target.

Empirically, the correct value for `MAX_READERS` seems to be `2^28 - 1`: removing the `- 1` re-introduces the deadlock, at least under our testing environment. This fix thus uses this value. However, I have no real justification to support that, because I find myself a bit at a loss when comparing the implementation details, the comment added above the test and what the current value is; some help would therefore be nice in this aspect. Also, the value change is restricted to 32-bit Win7 as there is no evidence to support it should be done for other targets.

cc @roblabla

@rustbot label O-windows-msvc O-windows-7 O-x86_32 A-atomic T-libs
…Mark-Simulacrum

Stabilize feature `isolate_most_least_significant_one`

FCP completed rust-lang#136909 (comment)

Closes rust-lang#136909
…, r=Mark-Simulacrum

Make Box/Rc/Arc::into_array allocator-aware (and add doctest)

Tracking issue for `alloc_slice_into_array`: rust-lang#148082

Tracking issue for `allocator_api`: rust-lang#32838

Make the `into_array` methods on `Box`, `Rc`, and `Arc` allocator-aware.

I think the allocator-aware-ness should not be observable on stable, so these should not be additionally (comment-)gated behind `feature(allocator_api)`, just like e.g. `Box::leak` and `Vec::into_boxed_slice`. The added doctests do not use `feature(allocator_api)`.

@rustbot label T-libs-api
…affleLapkin

`ty::Alias`: replace `def_id: did` with `def_id`

related issue: rust-lang#154941

tackling this task:

- [x] replace def_id: did with def_id where possible

r? @WaffleLapkin
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 11, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. labels Apr 11, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 11, 2026

📌 Commit 58ca4df has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 Apr 11, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 11, 2026
Rollup of 6 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 11, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #155057 (Update libc to v0.2.184)
 - #154967 (Test(lib/sync): Fix `test_rwlock_max_readers` for x86 Win7)
 - #154994 (don't leak internal temporaries from `dbg!`)
 - #155130 (Stabilize feature `isolate_most_least_significant_one`)
 - #154925 (Make Box/Rc/Arc::into_array allocator-aware (and add doctest))
 - #155063 (`ty::Alias`: replace `def_id: did` with `def_id`)
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 11, 2026

☀️ Try build successful (CI)
Build commit: 592c36f (592c36fe3d8c8acbfd33859bb83ffb6348f5420a, parent: bf4fbfb7a18d74e7cd8eef93af7329c58fbb5344)

@scottmcm
Copy link
Copy Markdown
Member

Over 5 hours? That's not good...

@rust-bors rust-bors bot 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 Apr 12, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 12, 2026

💥 Test timed out after 21600s

@jhpratt
Copy link
Copy Markdown
Member

jhpratt commented Apr 12, 2026

@bors try jobs=dist-x86_64-linux

Let's see if it'll pass a try job; this is the only job that didn't succeed. We've got plenty of time as a new rollup is now running followed by a rollup=never.

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 12, 2026
Rollup of 6 pull requests


try-job: dist-x86_64-linux
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 12, 2026

☀️ Try build successful (CI)
Build commit: 8599522 (85995229c13981e0afc2f0d4ff6252d1ecd36342, parent: bf4fbfb7a18d74e7cd8eef93af7329c58fbb5344)

@jhpratt
Copy link
Copy Markdown
Member

jhpratt commented Apr 12, 2026

Seems spurious then?

@bors retry

@rust-bors 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 Apr 12, 2026
@rust-bors

This comment has been minimized.

@rust-bors 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 Apr 12, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 12, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 8m 25s
Pushing d32e620 to main...

@rust-bors rust-bors bot merged commit d32e620 into rust-lang:main Apr 12, 2026
13 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 12, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154925 Make Box/Rc/Arc::into_array allocator-aware (and add doctes… 9f43c6eceee2993ae2f6e55dbb33d1dad33fc768 (link)
#154967 Test(lib/sync): Fix test_rwlock_max_readers for x86 Win7 c3bbeb06c46d642f6b3223b1eea57f9f3053a323 (link)
#154994 don't leak internal temporaries from dbg! e4b56c72170221d32f3118003a3fc4ee7f27fbcb (link)
#155057 Update libc to v0.2.184 ff49784ae51b8bebb9055453d84cc8d85c985e0e (link)
#155063 ty::Alias: replace def_id: did with def_id d5877f92b2d19fb01bbec2ebed270ae02b6527c6 (link)
#155130 Stabilize feature isolate_most_least_significant_one a924f8e9854a709e9390b2567ac43602295590c6 (link)

previous master: 6ad4d1b0e7

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
Copy link
Copy Markdown
Contributor

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 6ad4d1b (parent) -> d32e620 (this PR)

Test differences

Show 9570 test diffs

Stage 1

  • macros::tests::no_leaking_internal_temps_from_dbg: [missing] -> pass (J0)

Stage 2

  • macros::tests::no_leaking_internal_temps_from_dbg: [missing] -> pass (J1)

Additionally, 9568 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 d32e620a107b5b3dccd9ddb53fa124956a92b589 --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

  1. x86_64-msvc-2: 1h 54m -> 2h 28m (+29.5%)
  2. x86_64-msvc-ext1: 1h 38m -> 2h 6m (+28.6%)
  3. dist-aarch64-apple: 1h 44m -> 2h 5m (+20.6%)
  4. pr-check-1: 33m 6s -> 26m 30s (-19.9%)
  5. optional-x86_64-gnu-parallel-frontend: 2h 43m -> 2h 19m (-14.6%)
  6. x86_64-gnu-aux: 2h 23m -> 2h 3m (-13.8%)
  7. dist-aarch64-llvm-mingw: 1h 58m -> 1h 42m (-13.8%)
  8. x86_64-gnu-llvm-22-2: 1h 37m -> 1h 24m (-13.7%)
  9. x86_64-gnu-gcc: 1h 7m -> 58m 34s (-13.3%)
  10. aarch64-gnu-llvm-21-1: 1h 4m -> 56m 58s (-12.0%)
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
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d32e620): comparison URL.

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

Max RSS (memory usage)

Results (primary -2.2%, secondary 2.2%)

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)
4.7% [3.4%, 6.0%] 2
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

Cycles

Results (primary -5.0%, secondary 4.6%)

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

mean range count
Regressions ❌
(primary)
3.9% [3.9%, 3.9%] 1
Regressions ❌
(secondary)
10.4% [2.1%, 27.0%] 3
Improvements ✅
(primary)
-7.2% [-12.2%, -2.6%] 4
Improvements ✅
(secondary)
-4.0% [-5.8%, -2.3%] 2
All ❌✅ (primary) -5.0% [-12.2%, 3.9%] 5

Binary size

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

Bootstrap: 488.442s -> 489.526s (0.22%)
Artifact size: 394.16 MiB -> 394.19 MiB (0.01%)

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

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.