Skip to content

Rollup of 3 pull requests - #164117

Merged
rust-bors[bot] merged 45 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-pex5Uby
Oct 10, 2026
Merged

rust-bors[bot] merged 45 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-pex5Uby

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

RalfJung and others added 30 commits October 5, 2026 10:04
libc-pipe test: fix FreeBSD-related comment
On FreeBSD this may cause trouble if the ABI does not match between libc
versions. However, std and libc currently use the same ABI version. If this ever
changes, we should figure out how FreeBSD supports old programs against a new
OS, and do the same thing.
stop trusting the user types for stat and dirent
These three dependencies are only used on x86 targets causing
`cargo::unused_dependencies` warnings on other architectures.
narrow nix/ipc-channel/capstone deps to x86 targets
Windows CreateFileW: detect some more unsupported flag combinations
ui tests: assume less about user paths
stub out some shims to make File debug-print something
CI: reject all warnings, including those from cargo
This updates the rust-version file to 0f6e5bf.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Previous upstream ref: rust-lang/rust@56343b1
New upstream ref: rust-lang/rust@0f6e5bf
Filtered ref: rust-lang/miri@5e5a38d
Upstream diff: rust-lang/rust@56343b1...0f6e5bf

This merge was created using https://github.com/rust-lang/josh-sync.
RalfJung and others added 8 commits October 10, 2026 12:35
test some more openat uses and fix Windows symlink handling
miri subtree update

In particular this fixes some unused dependencies.

---

Subtree update of `miri` to rust-lang/miri@be95537.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
…a-kruppe

Replace `Unique` in `Box` with a `(NonNull, PhantomData)` wrapper

Follow-up to rust-lang#162804

See [zulip](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/Can.20we.20nuke.20.60Unique.60.3F/with/624141418).

This is only the first step in actually refactoring `Box`, and is essentially just a rename.
The layout of `Box` stays as-is for now, due to rust-lang#162850.

Needs perf run
…, r=jieyouxu

Disable default cc optimizations in shell.nix

Fixes rust-lang/miri#5393.

Apparently, in dev shells, nix configures the c compiler to pass `-O2` by default for hardening.
This is a problem because it breaks some miri tests, since miri doesn't support all instructions in its native-lib handling, and thus needs the c compiler to behave somewhat predictably (not enable optimizations it didn't ask for).

This PR disables that particular hardening mechansim in the `shell.nix`, so that the c compiler behaves like everyone expects a normal c compiler to behave.

Relevant part of the nix docs: https://nixos.org/manual/nixpkgs/unstable/#fortify

After this PR, `x test miri -- tests/native-lib/pass/ptr_write_access.rs` runs successfully inside the dev shell. I've verified this both on my nixos install, as well as on a minimal fedora vm.

r? bootstrap
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 10, 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 Oct 10, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b7c8f42 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 Oct 10, 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 Oct 10, 2026
@rust-bors

rust-bors Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 3m 14s
Pushing 6f5da40 to main...

@rust-bors
rust-bors Bot merged commit 6f5da40 into rust-lang:main Oct 10, 2026
15 checks passed
@rustbot rustbot added this to the 1.101.0 milestone Oct 10, 2026
@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 6e4cba3 (parent) -> 6f5da40 (this PR)

Test differences

Show 243 test diffs

243 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 6f5da406b56c2db6607202b63daee73aa8c61297 --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. test-i686-gnu-1: 1h 25m -> 2h 15m (+59.7%)
  2. dist-arm-linux-musl: 1h 11m -> 1h 46m (+49.3%)
  3. dist-x86_64-solaris: 1h 11m -> 1h 46m (+49.1%)
  4. dist-x86_64-netbsd: 1h 5m -> 1h 33m (+43.1%)
  5. dist-powerpc-linux: 1h 5m -> 1h 32m (+40.7%)
  6. dist-riscv64-linux-musl: 1h 3m -> 1h 28m (+39.6%)
  7. test-i686-gnu-nopt-2: 2h 14m -> 1h 22m (-39.0%)
  8. test-various: 1h 31m -> 2h 6m (+38.3%)
  9. test-armhf-gnu: 1h 30m -> 56m 38s (-37.2%)
  10. test-x86_64-gnu-tools: 46m 5s -> 1h 2m (+35.2%)
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-bors

rust-bors Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#164092 miri subtree update c99482c1c2ee92186b1371283d43656db4c3d157
(link)
#162849 Replace Unique in Box with a (NonNull, PhantomData) w… 94045822ca063b9828b580f443c55d79a36a1858
(link)
#163900 Disable default cc optimizations in shell.nix 04793d9b969271c4ad15b496e81798ee2662ccde
(link)

parent commit: 6e4cba3380

In the case of a perf regression, run the following command with the SHAs of each PR you suspect might be the cause: @rust-timer triage $SHA $SHA $SHA..., or run @rust-timer triage all to benchmark all rollup members.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (6f5da40): comparison URL.

Overall result: ❌ regressions - please read:

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.4% [0.2%, 0.5%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [0.2%, 0.5%] 3

Max RSS (memory usage)

Results (primary 0.3%, secondary 0.2%)

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

mean range count
Regressions ❌
(primary)
1.4% [0.8%, 2.2%] 8
Regressions ❌
(secondary)
2.5% [1.0%, 4.7%] 10
Improvements ✅
(primary)
-3.7% [-3.8%, -3.6%] 2
Improvements ✅
(secondary)
-4.2% [-5.1%, -3.6%] 5
All ❌✅ (primary) 0.3% [-3.8%, 2.2%] 10

Cycles

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

Binary size

Results (primary 0.1%, secondary 0.1%)

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

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.2%] 120
Regressions ❌
(secondary)
0.1% [0.0%, 0.2%] 109
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.0%, 0.2%] 120

Bootstrap: 488.311s -> 488.596s (0.06%)
Artifact size: 407.22 MiB -> 407.26 MiB (0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Oct 10, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@rust-timer triage all

@rust-timer

rust-timer commented Oct 11, 2026 •

Copy link
Copy Markdown
Collaborator
Running triage with 2 benchmarks

Triage only executes the benchmarks on rollup members, that were changed significantly on the rollup.
For this rollup, these benchmarks are:

  • hyper-1.6.0
  • syn-2.0.101

#164092 c99482c miri subtree update

This perf run didn't have relevant results for the `instruction count` metric.

Instruction count

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

Max RSS (memory usage)

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

Cycles

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

Binary size

Results (primary 0.1%)

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

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

#162849 9404582 Replace Unique in Box with a (NonNull, PhantomData) wrapper

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.4% [0.2%, 0.5%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [0.2%, 0.5%] 3

Max RSS (memory usage)

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

Cycles

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

Binary size

Results (primary 0.1%)

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

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

#163900 04793d9 Disable default cc optimizations in shell.nix

This perf run didn't have relevant results for the `instruction count` metric.

Instruction count

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

Max RSS (memory usage)

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

Cycles

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

Binary size

Results (primary 0.1%)

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

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

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. perf-regression Performance regression. 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.

8 participants