Skip to content

Rollup of 8 pull requests#158068

Merged
rust-bors[bot] merged 17 commits into
rust-lang:mainfrom
jhpratt:rollup-9fQ5FBj
Jun 18, 2026
Merged

Rollup of 8 pull requests#158068
rust-bors[bot] merged 17 commits into
rust-lang:mainfrom
jhpratt:rollup-9fQ5FBj

Conversation

@jhpratt

@jhpratt jhpratt commented Jun 18, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

asomers and others added 17 commits January 14, 2026 11:17
The current Linux driver treats every sendmsg call as a separate record.
That is, it behaves as though MSG_EOR is always set.  But that might not
be true forever.  And the current FreeBSD driver does _not_ do that, so
setting MSG_EOR is important for portability.
…ameters in by-value returns"

This reverts commit 519a555.

The regression test added by that commit asserts that redundant stores
are present, which locks in suboptimal assembly output and will actively
block any future fix from landing.
Clarified how `with_added_extension` deals with the return value from `add_extension`. I added some "interesting" examples to illustrate.
This makes it consistent with the other late internal lints.

It doesn't need to be a crate-level pass because it doesn't implement
`check_crate` or `check_crate_post` and/or track any crate-level
information.
Instead of N separate passes. This is more efficient for bootstrapping.
It also matches what is done for builtin lints
(`BuiltinCombined*LintPass`).
@abrown has
[commented](rust-lang#157644 (comment))
that he is no longer maintaining the target.

Update the target maintainers list accordingly.
Put internal lints into a single combined pass

Details in individual commits.

r? @Urgau
Take care to use MSG_EOR with SOCK_SEQPACKET sockets

The current Linux driver treats every sendmsg call as a separate record. That is, it behaves as though MSG_EOR is always set.  But that might not be true forever.  And the current FreeBSD driver does _not_ do that, so setting MSG_EOR is important for portability.

r? @the8472
wasm32-wasip1-threads: Correct llvm target name

Intends to fix rust-lang#131007, a problem with cross-compiling Rust+C++ to wasm32-wasip1-threads: clang will be told to compile for `--target=wasm32-wasi`, which it interprets as `wasm32-wasip1`, which is not compatible with `wasm32-wasip1-threads`.

I wonder if there might be any compatibility issue or something depending on the old incorrect name...
…vooeo

Revert "add regression test for Redundant memory strores with mut parameters in by-value returns"

This reverts commit 519a555 (PR rust-lang#154841).

The regression test added by that commit asserts that redundant stores are present, which locks in suboptimal assembly output and will actively block any future fix from landing.

The underlying issue (rust-lang#149762) is therefore not fixed. Since 1.92.0, both `with_rebind` and `with_mut_param` compile to the same suboptimal assembly, whereas in 1.91.0 `with_rebind` at least produced optimal output. A correct regression test should verify that neither function emits redundant stores, and should be added together with an actual fix.

rust-lang#149762 (comment)
Document `with_added_extension` edge cases

Clarified how `with_added_extension` deals with the return value from `add_extension`. I added some "interesting" examples to illustrate.

IMO this function should have returned `Result` but unfortunately the discussion about that was kind of ignored. :-/ We can at least document it well.

No AI was used to make this change.
…rs, r=JonathanBrouwer

fix unresolved import suggestion before outer attributes

Fixes rust-lang#69733.

Issue rust-lang#69733 reports an invalid import suggestion where rustc could insert a new `use ...;` item between an outer attribute and the item it annotates. This invalid import suggestion produces broken code.

My PR adds a `run-rustfix` UI regression test for that. The fixed output verifies that the suggested import is inserted before the leading outer attribute
rustc book: Update wasm32-wasip1-threads's maintainers list

@abrown has
[commented](rust-lang#157644 (comment)) that he is no longer maintaining the target.

Update the target maintainers list accordingly.

r? abrown
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 18, 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 Jun 18, 2026
@jhpratt

jhpratt commented Jun 18, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 61d1ca8 has been approved by jhpratt

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 Jun 18, 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 Jun 18, 2026
@rust-bors

rust-bors Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 12m 45s
Pushing c55fad5 to main...

@rust-bors rust-bors Bot merged commit c55fad5 into rust-lang:main Jun 18, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 18, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151132 Take care to use MSG_EOR with SOCK_SEQPACKET sockets b34beb6b00346c0aecc300e9a7f388acaa7e1469 (link)
#157644 wasm32-wasip1-threads: Correct llvm target name a4dc4664fa0025604a37ecb574e8f27d926c9733 (link)
#157912 stabilize str_from_utf16_endian 26c003fdf0305e6bc453aa9ed39e1b9e0c8032e9 (link)
#158048 Revert "add regression test for Redundant memory strores wi… 8a4786a5c87f99cafd38f119437d5f4fea9524f3 (link)
#158051 Document with_added_extension edge cases 45b8b349271beeeb5808ec163c1b292c2a1a4c31 (link)
#158054 fix unresolved import suggestion before outer attributes 1f388a5e3f36d39bf789fa9ae82b6836eb8c1aea (link)
#158056 Put internal lints into a single combined pass 03c66308ed5c50d036da1434eb68c30a2b8b582f (link)
#158062 rustc book: Update wasm32-wasip1-threads's maintainers list 723238d359b98c658d9dbd31d96a081ed6a58001 (link)

previous master: 9639eefc07

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 9639eef (parent) -> c55fad5 (this PR)

Test differences

Show 341 test diffs

Stage 1

  • [ui (polonius)] tests/ui/resolve/suggest-import-before-outer-attrs-issue-69733.rs: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/riscv-redundant-memory-stores.rs: ignore (only executed when the architecture is riscv64) -> [missing] (J1)
  • [ui] tests/ui/resolve/suggest-import-before-outer-attrs-issue-69733.rs: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/resolve/suggest-import-before-outer-attrs-issue-69733.rs: [missing] -> pass (J2)
  • [assembly] tests/assembly-llvm/riscv-redundant-memory-stores.rs: ignore (only executed when the architecture is riscv64) -> [missing] (J4)

Additionally, 336 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 c55fad5a9048ad0f7cff2a4867a297647af9392b --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-1: 1h 37m -> 2h 34m (+58.1%)
  2. dist-x86_64-apple: 1h 25m -> 2h 5m (+45.9%)
  3. x86_64-mingw-2: 1h 50m -> 2h 37m (+42.4%)
  4. dist-x86_64-netbsd: 1h 8m -> 1h 33m (+36.1%)
  5. dist-x86_64-solaris: 1h 36m -> 1h 3m (-34.3%)
  6. optional-x86_64-gnu-parallel-frontend: 2h -> 2h 37m (+31.0%)
  7. dist-powerpc64-linux-musl: 1h 36m -> 1h 7m (-30.4%)
  8. dist-armv7-linux: 1h 12m -> 1h 32m (+28.3%)
  9. x86_64-gnu-gcc-core-tests: 11m 39s -> 14m 43s (+26.3%)
  10. dist-powerpc64le-linux-musl: 1h 31m -> 1h 54m (+25.1%)
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 mentioned this pull request Jun 18, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (c55fad5): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 4.1%, secondary 2.5%)

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

mean range count
Regressions ❌
(primary)
4.1% [4.1%, 4.1%] 1
Regressions ❌
(secondary)
2.5% [2.5%, 2.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 4.1% [4.1%, 4.1%] 1

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% [2.1%, 6.0%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

Results (primary -0.0%, 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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.0% [-0.0%, -0.0%] 15
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.1%] 4
All ❌✅ (primary) -0.0% [-0.0%, -0.0%] 15

Bootstrap: 482.613s -> 481.592s (-0.21%)
Artifact size: 390.75 MiB -> 391.21 MiB (0.12%)

@jhpratt jhpratt deleted the rollup-9fQ5FBj branch June 18, 2026 15: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.

10 participants