Skip to content

Rollup of 5 pull requests#158610

Merged
rust-bors[bot] merged 14 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-YAPZ5ee
Jun 30, 2026
Merged

Rollup of 5 pull requests#158610
rust-bors[bot] merged 14 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-YAPZ5ee

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

bjorn3 and others added 14 commits June 29, 2026 14:21
These functions are scoped to a single codegened function
These functions are scoped to a single codegened function
This test currently fails under both x86 and x86_64 Win7 on:

```
thread 'net::tests::hostname_smoketest' (2304) panicked at library/std/src/net/tests.rs:46:14:
called `Result::unwrap()` on an `Err` value: Error { kind: Unsupported, message: "operation not supported on this platform" }
```

This is simply because the feature was made to be effectively disabled
under these targets in PR 150905. The test is therefore fixed in order
to reflect that appropriately.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
…-keyword-order, r=chenyukang

Fix `rustc --unpretty=expanded` emit of `[const] [unsafe] impl Trait for`

Fixes rust-lang#158599
…ivooeo

Move per-function debuginfo methods from codegen to builder methods

In cg_clif the debuginfo for the function we are currently codegening is stored in `FunctionDebugContext`, which is stored in the `FunctionCx`, not in the per-cgu `DebugContext`.
…e_smoketest, r=JohnTitor

Test(lib/net): Fix `hostname_smoketest` for Win7

This test currently fails under both x86 and x86_64 Win7 on:

```
thread 'net::tests::hostname_smoketest' (2304) panicked at library/std/src/net/tests.rs:46:14:
called `Result::unwrap()` on an `Err` value: Error { kind: Unsupported, message: "operation not supported on this platform" }
```

This is simply because the feature was made to be effectively disabled under these targets in rust-lang#150905. The test is therefore fixed in order to reflect that appropriately.

cc rust-lang#135142 @roblabla

@rustbot label O-windows-7 O-x86_32 O-x86_64 A-io T-libs
Update books

## rust-lang/nomicon

1 commits in cc6a6bae8c3bfa389974e533c54694662c1a9de6..5012a37c682b26c4e19433888ed2ca9b129696ca
2026-06-25 10:05:58 UTC to 2026-06-25 10:05:58 UTC

- Clarify when safety may rely on correctness (rust-lang/nomicon#523)

## rust-lang/reference

10 commits in 2c27905c15a51983b54d84f050d3bda096194d27..86635e30bf861a038dc197d7e16fd09e7e514e7a
2026-06-25 17:00:32 UTC to 2026-06-16 18:56:35 UTC

- use-declarations.md: move example to where it's described (rust-lang/reference#2295)
- fix link target (rust-lang/reference#2299)
- remove broken text (rust-lang/reference#2297)
- type-layout: rewrite `#[repr(C)]` struct layout algorithm (rust-lang/reference#2243)
- Fix grammar rules containing or pertaining to bounds (rust-lang/reference#2257)
- Document metadata of ptrs to indirectly unsized types (rust-lang/reference#2289)
- Generalize the wide-pointer total-size bound (rust-lang/reference#2290)
- Cover `str` in the wide-pointer metadata rule (rust-lang/reference#2288)
- Define an unsized tail (rust-lang/reference#2287)
- Define pointer metadata (rust-lang/reference#2286)
…ldb, r=Mark-Simulacrum

tests: only run `lexical-scope-in-match.rs` for LLDB >= 21

Dev Desktops currently run on an Ubuntu which has an older LLDB (e.g. LLDB 18), where this debuginfo test fails.

Run this test only on LLDB >= 21. This passes for me locally with Apple/Swift-variant LLDB 21.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 30, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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 30, 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,i686-msvc-2

@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 8b54e84 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 Jun 30, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jun 30, 2026
Rollup of 5 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
try-job: i686-msvc-2
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jun 30, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #158600 (Fix `rustc --unpretty=expanded` emit of `[const] [unsafe] impl Trait for`)
 - #158560 (Move per-function debuginfo methods from codegen to builder methods)
 - #158563 (Test(lib/net): Fix `hostname_smoketest` for Win7)
 - #158571 (Update books)
 - #158592 (tests: only run `lexical-scope-in-match.rs` for LLDB >= 21)
@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 Jun 30, 2026
@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

💔 Test for f5dca5d failed: CI. Failed job:

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[TIMING:end] builder::Libdir { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu } -- 0.001
##[group]Building stage1 tidy (stage0 -> stage1, x86_64-unknown-linux-gnu)
error: process didn't exit successfully: `sccache /checkout/obj/build/bootstrap/debug/rustc -vV` (exit status: 2)
--- stderr
sccache: error: Timed out waiting for server startup. Maybe the remote service is unreachable?
Run with SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 to get more information

Bootstrap failed while executing `test src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck`
Build completed unsuccessfully in 0:00:27
  local time: Tue Jun 30 12:23:11 UTC 2026
  network time: Tue, 30 Jun 2026 12:23:11 GMT

@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

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

This comment has been minimized.

@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 51c31e0 (51c31e0b6ef2595a4d767fa0c42ee1ce37f0a5c9)
Base parent: 3456328 (345632878cffcb4c8e90750e943296b43d16c76e)

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

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 54m 16s
Pushing f46ec52 to main...

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

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#158600 Fix rustc --unpretty=expanded emit of `[const] [unsafe] i… aae7ec0320e59a46bb1cbfc8c5dcc4d25945b875 (link)
#158560 Move per-function debuginfo methods from codegen to builder… e871c28a8d0be045c35116d54caaffe59fb3ac76 (link)
#158563 Test(lib/net): Fix hostname_smoketest for Win7 ec70ea354cd30c326e6fd1b12827983e73fa9640 (link)
#158571 Update books f0b4b7859a4fcecc35248b86103d9f668a8a5ce8 (link)
#158592 tests: only run lexical-scope-in-match.rs for LLDB >= 21 db942017799f31b12d84f65d93df7b6bdeabf251 (link)

previous master: 51657149e9

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 5165714 (parent) -> f46ec52 (this PR)

Test differences

Show 1 test diff

Stage 2

  • [debuginfo-lldb] tests/debuginfo/lexical-scope-in-match.rs: pass -> ignore (ignored when the LLDB version is 2100) (J0)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard f46ec5218fe7829ac18323b5ee0b409a63169f27 --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. i686-msvc-2: 1h 14m -> 1h 57m (+57.3%)
  2. dist-powerpc64-linux-gnu: 1h 6m -> 1h 39m (+50.9%)
  3. x86_64-msvc-2: 2h 28m -> 1h 23m (-43.4%)
  4. x86_64-gnu-llvm-22-1: 58m 20s -> 1h 19m (+36.5%)
  5. x86_64-gnu-debug: 1h 39m -> 2h 15m (+36.4%)
  6. dist-aarch64-apple: 1h 49m -> 2h 28m (+35.9%)
  7. dist-x86_64-musl: 2h 19m -> 1h 36m (-30.5%)
  8. x86_64-gnu-aux: 2h 50m -> 2h 21m (-17.4%)
  9. x86_64-gnu-stable: 2h 24m -> 2h (-16.3%)
  10. test-various: 2h 37m -> 2h 12m (-16.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-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (f46ec52): 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 -2.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)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.1% [-2.1%, -2.1%] 1

Cycles

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

Binary size

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

Bootstrap: 486.893s -> 485.565s (-0.27%)
Artifact size: 393.67 MiB -> 393.29 MiB (-0.10%)

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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.

8 participants