Rollup of 4 pull requests by matthiaskrgr · Pull Request #153642 · rust-lang/rust

matthiaskrgr · 2026-03-10T06:22:00Z

Successful merges:

In Option::get_or_insert_with(), forget the None instead of dropping it. #148562 (In Option::get_or_insert_with(), forget the None instead of dropping it.)
tests/ui/cfg: add annotations for reference rules #153325 (tests/ui/cfg: add annotations for reference rules)
Remove TyCtxt::node_span_lint method #153621 (Remove TyCtxt::node_span_lint method)
rustdoc-json: Improve docs for ItemEnum::item_kind #153627 (rustdoc-json: Improve docs for ItemEnum::item_kind)

…ing it. This allows eliminating the `T: [const] Destruct` bounds and avoids generating an implicit `drop_in_place::<Option<T>>()` that will never do anything. Ideally, the compiler would prove that that drop is not necessary itself, but it currently doesn't, even with `const_precise_live_drops` enabled.

Fixes rust-lang#153279 (comment)

In `Option::get_or_insert_with()`, forget the `None` instead of dropping it. Per rust-lang#148486 (comment) In `Option::get_or_insert_with()`, after replacing the `None` with `Some`, forget the `None` instead of dropping it. This allows eliminating the `T: [const] Destruct` bounds, making the functions more flexible in (unstable) const contexts, and avoids generating an implicit `drop_in_place::<Option<T>>()` that will never do anything (and which might even persist after optimization).

…nditional-compilation, r=ehuss tests/ui/cfg: add annotations for reference rules

@JonathanBrouwer

…athanBrouwer Remove `TyCtxt::node_span_lint` method Part of rust-lang#153099. One less obstacle before we can remove `lint_level` function. :) r? @JonathanBrouwer

@GuillaumeGomez

…laumeGomez rustdoc-json: Improve docs for `ItemEnum::item_kind` Fixes rust-lang#153279 (comment) r? @GuillaumeGomez CC @LukeMathWalker

matthiaskrgr · 2026-03-10T06:22:35Z

@bors r+ rollup=never p=5

rust-bors · 2026-03-10T06:22:42Z

📌 Commit b01e56d has been approved by matthiaskrgr

It is now in the queue for this repository.

Rollup of 4 pull requests Successful merges: - #148562 (In `Option::get_or_insert_with()`, forget the `None` instead of dropping it.) - #153325 (tests/ui/cfg: add annotations for reference rules) - #153621 (Remove `TyCtxt::node_span_lint` method) - #153627 (rustdoc-json: Improve docs for `ItemEnum::item_kind`)

rust-bors · 2026-03-10T09:31:57Z

💔 Test for 2254b92 failed: CI. Failed job:

auto - x86_64-gnu-miri (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-03-10T09:42:37Z

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

Click to see the possible cause of the failure (guessed by this bot)

/dev/sda15      105M  6.2M   99M   6% /boot/efi
tmpfs           1.6G   12K  1.6G   1% /run/user/1001
================================================================================

Sufficient disk space available (95007120KB >= 52428800KB). Skipping cleanup.
##[group]Run src/ci/scripts/setup-environment.sh
src/ci/scripts/setup-environment.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
##[endgroup]
Image input checksum 72ecab2d23f2d77608df76481a5ada15b19d498a7dc3d48372c9a7a712b5b5ebbf396a23a20676c985663ba6d58ad0821d6c2d4213f3296bb226507df1b7fa67
##[group]Building docker image for x86_64-gnu-miri
Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang&client_id=docker&offline_token=true&service=ghcr.io": net/http: request canceled (Client.Timeout exceeded while awaiting headers) (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"
echo "disk usage:"
df -h
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

Zalathar · 2026-03-10T09:51:04Z

Looks like we're seeing a streak of network failures.

@bors treeclosed=1000

rust-bors · 2026-03-10T09:51:08Z

Tree closed for PRs with priority less than 1000.

JonathanBrouwer · 2026-03-10T09:56:29Z

@bors p=1000

Rollup of 4 pull requests Successful merges: - #148562 (In `Option::get_or_insert_with()`, forget the `None` instead of dropping it.) - #153325 (tests/ui/cfg: add annotations for reference rules) - #153621 (Remove `TyCtxt::node_span_lint` method) - #153627 (rustdoc-json: Improve docs for `ItemEnum::item_kind`)

rust-bors · 2026-03-10T10:03:55Z

💔 Test for 5c216d1 failed: CI. Failed job:

auto - x86_64-gnu (web logs, enhanced plaintext logs)

JonathanBrouwer · 2026-03-10T10:31:45Z

@bors retry

rust-log-analyzer · 2026-03-10T11:46:49Z

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

Click to see the possible cause of the failure (guessed by this bot)

/dev/sda15      105M  6.2M   99M   6% /boot/efi
tmpfs           1.6G   12K  1.6G   1% /run/user/1001
================================================================================

Sufficient disk space available (95909384KB >= 52428800KB). Skipping cleanup.
##[group]Run src/ci/scripts/setup-environment.sh
src/ci/scripts/setup-environment.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

jyn514 · 2026-03-10T12:37:40Z

i mean, the network is fine, it's ghcr.io that's down ...

rust-bors · 2026-03-10T13:50:54Z

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 18m 46s
Pushing 0c68443 to main...

rust-timer · 2026-03-10T13:52:04Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#148562	In `Option::get_or_insert_with()`, forget the `None` instea…	`33891b65ed9b64812e7efe000fdf6f3db671bf15` (link)
#153325	tests/ui/cfg: add annotations for reference rules	`df67f754b00fcd06750c5483c9b91be1917e9aba` (link)
#153621	Remove `TyCtxt::node_span_lint` method	`8bcd51980b376bb405c774cbaf77b5efe42eab96` (link)
#153627	rustdoc-json: Improve docs for `ItemEnum::item_kind`	`8dfbefe5b670bf377ef30be14bc5f7031430fb37` (link)

previous master: 3bc6ea5673

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 · 2026-03-10T13:54:03Z

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 3bc6ea5 (parent) -> 0c68443 (this PR)

Test differences

Show 244 test diffs

Stage 1

option::const_get_or_insert_default: [missing] -> pass (J1)
option::const_get_or_insert_with: [missing] -> pass (J1)

Stage 2

option::const_get_or_insert_default: [missing] -> pass (J0)
option::const_get_or_insert_with: [missing] -> pass (J0)

Additionally, 240 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 0c68443b0a0469e4211acca7e7b06e14f256ada8 --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

pr-check-1: 27m 17s -> 33m 54s (+24.2%)
aarch64-apple: 2h 41m -> 3h 11m (+18.2%)
dist-apple-various: 1h 51m -> 1h 31m (-18.2%)
i686-gnu-2: 1h 30m -> 1h 43m (+15.0%)
pr-check-2: 38m 45s -> 44m 31s (+14.9%)
x86_64-gnu-llvm-20-3: 1h 44m -> 1h 59m (+14.8%)
dist-ohos-armv7: 1h 10m -> 1h 19m (+12.8%)
aarch64-gnu-llvm-20-1: 53m 18s -> 59m 31s (+11.7%)
dist-aarch64-apple: 1h 33m -> 1h 44m (+11.4%)
x86_64-gnu-aux: 2h 13m -> 2h 28m (+11.3%)

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.

JonathanBrouwer · 2026-03-10T14:00:35Z

@bors treeopen

rust-bors · 2026-03-10T14:00:39Z

Tree is now open for merging.

rust-timer · 2026-03-10T14:32:19Z

Finished benchmarking commit (0c68443): 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.2%	[-0.2%, -0.1%]	3
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.1%]	15
All ❌✅ (primary)	-0.2%	[-0.2%, -0.1%]	3

Max RSS (memory usage)

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

Cycles

Results (primary 5.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)	5.0%	[5.0%, 5.0%]	1
Regressions ❌ (secondary)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	5.0%	[5.0%, 5.0%]	1

Binary size

Results (primary 1.4%, secondary -0.0%)

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

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

Bootstrap: 479.559s -> 480.034s (0.10%)
Artifact size: 394.94 MiB -> 394.90 MiB (-0.01%)

kpreid and others added 11 commits November 23, 2025 15:00

tests/ui/cfg: add annotations for reference rules

226b4dd

Remove usage of TyCtxt::node_span_lint in librustdoc

4c48a5b

rustdoc-json: Improve docs for ItemEnum::item_kind

ca9bd0d

Fixes rust-lang#153279 (comment)

Remove usage of TyCtxt::node_span_lint in clippy

e54a3d3

Remove TyCtxt::node_span_lint method

562e981

Remove TyCtxt::node_span_lint mention in docs

4d7624e

Rollup merge of rust-lang#153325 - DanielEScherzer:test-references-co…

4e0adfe

…nditional-compilation, r=ehuss tests/ui/cfg: add annotations for reference rules

Rollup merge of rust-lang#153621 - GuillaumeGomez:migrate-diag, r=Jon…

531dafd

…athanBrouwer Remove `TyCtxt::node_span_lint` method Part of rust-lang#153099. One less obstacle before we can remove `lint_level` function. :) r? @JonathanBrouwer

Rollup merge of rust-lang#153627 - aDotInTheVoid:rustdocsdocs, r=Guil…

b01e56d

…laumeGomez rustdoc-json: Improve docs for `ItemEnum::item_kind` Fixes rust-lang#153279 (comment) r? @GuillaumeGomez CC @LukeMathWalker

rust-bors bot added the rollup A PR which is a rollup label Mar 10, 2026

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 Mar 10, 2026

This comment has been minimized.

Sign in to view

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 Mar 10, 2026

This comment has been minimized.

Sign in to view

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 Mar 10, 2026

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 Mar 10, 2026

This comment has been minimized.

Sign in to view

rust-bors bot mentioned this pull request Mar 10, 2026

Implement coercions between &pin (mut|const) T and &(mut) T when T: Unpin #149130

Open

This was referenced Mar 10, 2026

fix: don't suggest replacing env!("CARGO_BIN_NAME") with itself #152302

Open

Rollup of 4 pull requests #153654

Closed

Allow ./x test to run tests without doc tests and without benchmarks #153143

Open

This was referenced Mar 10, 2026

Pass -pg to linker when using -Zinstrument-mcount #152457

Open

triagebot: remove myself from some mention groups #153657

Open

scalable vector: type renames and simple checks #153653

Open

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 10, 2026

rust-bors bot merged commit 0c68443 into rust-lang:main Mar 10, 2026
12 checks passed

rustbot added this to the 1.96.0 milestone Mar 10, 2026

rust-bors bot mentioned this pull request Mar 10, 2026

Rollup of 8 pull requests #153658

Closed

Uh oh!

Conversation

matthiaskrgr commented Mar 10, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 10, 2026

Uh oh!

rust-log-analyzer commented Mar 10, 2026

Uh oh!

Zalathar commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

JonathanBrouwer commented Mar 10, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 10, 2026

Uh oh!

JonathanBrouwer commented Mar 10, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Mar 10, 2026

Uh oh!

jyn514 commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

Uh oh!

rust-timer commented Mar 10, 2026

Uh oh!

github-actions bot commented Mar 10, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

JonathanBrouwer commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

rust-timer commented Mar 10, 2026

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

matthiaskrgr commented Mar 10, 2026 •

edited by rustbot

Loading