Skip to content

Rollup of 6 pull requests#153260

Merged
rust-bors[bot] merged 14 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-J54yMmy
Mar 1, 2026
Merged

Rollup of 6 pull requests#153260
rust-bors[bot] merged 14 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-J54yMmy

Conversation

@JonathanBrouwer
Copy link
Contributor

Successful merges:

r? @ghost

Create a similar rollup

petrochenkov and others added 14 commits February 12, 2026 19:14
…Mark-Simulacrum

std: move `getpid` to `sys::process`

Part of rust-lang#117276.

Availability of process IDs is highly correlated with availability of processes, so moving the `getpid` implementations to `sys::process` makes a lot of sense (and removes quite some code duplication). The only notable change here is on Hermit, which doesn't have processes but does have `getpid`. But that [always returns 0](https://github.com/hermit-os/kernel/blob/ef27b798856b50d562a42c4ffd2edcb7493c5b5f/src/syscalls/tasks.rs#L21), so I doubt it is useful. If the change to a panic is problematic we could always copy the stub implementation and return zero ourselves (this also applies to the other single-process platforms).

CC @stlankes @mkroening
Revert "resolve: Downgrade `ambiguous_glob_imports` to warn-by-default"

This reverts commit cd05071.

Revert of rust-lang#151130.
This will need to be merged after ~February 27 2026, when Rust 1.95 branches out from the main branch.
… r=Kivooeo

diags: Pass `DiagArgMap` instead of `FluentArgs` into `format_diag_message`

This PR no longer exposes `FluentArgs` outside of `translation.rs`, instead using the already existing `DiagArgMap`.
This is in preparation of a few upcoming PRs, as well as just making the code slightly nicer.

Will do a perf run because this technically calls `to_fluent_args` a few more times than previously, but not expecting this to be significant
Fix compile error in std::fs impl on VEXos target

This PR fixes a compile error in the standard library on the `armv7a-vex-v5` target that was caused by there not being a version of the `Dir` struct exported from `std::sys::fs::vexos`. Reading from directories isn't supported on this platform, so the module now re-exports the unsupported version of `Dir`.
…oboet

Recover feature lang_items for emscripten

Fixes rust-lang#152469 (comment)

The previous rust-lang#153128 lacks of `feature`
update my mailmap

This canonicalizes new email addresses in the mailmap.

self reviews are OK for this kind of change: r? me
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 1, 2026
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 1, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

📌 Commit 0f378f9 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2026
@JonathanBrouwer
Copy link
Contributor Author

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

@rust-bors

This comment has been minimized.

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


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

rust-bors bot commented Mar 1, 2026

☀️ Try build successful (CI)
Build commit: d4f44a9 (d4f44a9a30748fdc680b0086f278db39cf9c8807, parent: 024757fea5c9ac50d7cc81f5f3a686d0a3a3cf9e)

@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 Mar 1, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

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

@rust-bors rust-bors bot merged commit 8038127 into rust-lang:main Mar 1, 2026
13 checks passed
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

PR #152549, which is a member of this rollup, was unapproved.
This rollup was thus also unapproved.

@rustbot rustbot added this to the 1.96.0 milestone Mar 1, 2026
@rust-bors rust-bors bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152549 Revert "resolve: Downgrade ambiguous_glob_imports to warn… 9bacd39c80dec233ac2458260ee578fa581c7945 (link)
#153130 std: move getpid to sys::process 4c3e256ea034dfeb9b06e568a1cdb8b14b33691d (link)
#153231 diags: Pass DiagArgMap instead of FluentArgs into `form… 640380fc6397eee41d3304594eb6eb5fec3c7741 (link)
#153246 Fix compile error in std::fs impl on VEXos target 350f46e08b2bd8c8a00a825eda09727d2128dd05 (link)
#153255 Recover feature lang_items for emscripten 8d9da89b1bd83444c164827287371ced8470c419 (link)
#153257 update my mailmap 116492a8feecc78efdc28d8204f04abfbda78eb1 (link)

previous master: 28b5c1cc08

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
Contributor

github-actions bot commented Mar 1, 2026

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 28b5c1c (parent) -> 8038127 (this PR)

Test differences

Show 11 test diffs

11 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 80381278a08582356c13b0f52af92d27c567c230 --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. dist-x86_64-apple: 2h 7m -> 2h 42m (+27.7%)
  2. dist-apple-various: 1h 38m -> 1h 54m (+16.0%)
  3. dist-aarch64-apple: 1h 46m -> 1h 56m (+10.0%)
  4. dist-aarch64-llvm-mingw: 1h 41m -> 1h 33m (-8.4%)
  5. arm-android: 1h 45m -> 1h 37m (-7.7%)
  6. x86_64-gnu-distcheck: 2h 18m -> 2h 7m (-7.6%)
  7. x86_64-gnu-aux: 2h 16m -> 2h 7m (-6.2%)
  8. dist-s390x-linux: 1h 27m -> 1h 22m (-5.8%)
  9. dist-aarch64-msvc: 1h 36m -> 1h 41m (+5.7%)
  10. dist-sparcv9-solaris: 1h 31m -> 1h 36m (+5.7%)
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
Collaborator

Finished benchmarking commit (8038127): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.8% [-1.8%, -1.8%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary 3.5%)

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)
3.5% [3.3%, 3.7%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 479.821s -> 480.971s (0.24%)
Artifact size: 397.02 MiB -> 396.96 MiB (-0.02%)

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

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants