Skip to content

Rollup of 2 pull requests#153544

Merged
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-LT1ogBG
Mar 7, 2026
Merged

Rollup of 2 pull requests#153544
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-LT1ogBG

Conversation

@JonathanBrouwer
Copy link
Contributor

@JonathanBrouwer JonathanBrouwer commented Mar 7, 2026

Successful merges:

r? @ghost

Create a similar rollup

Ozzy1423 and others added 8 commits March 4, 2026 08:29
@Ozzy1423
Gate #![reexport_test_harness_main] properly
4af572d
@cuviper
Replace version placeholders with 1.95.0
78157dd 
(cherry picked from commit bad24cc)
@cuviper
Bump stage0 to 1.95.0-beta.1
1bc673f
@cuviper
Clear STAGE0_MISSING_TARGETS
7e04ef8
@cuviper
Update cfg(bootstrap)
32bae13
@cuviper
Reformat with the new stage0
eb093cf
@JonathanBrouwer
Rollup merge of rust-lang#153462 - cuviper:bootstrap-update, r=Mark-S…
65a7e52 
…imulacrum

Bootstrap update

- Replace version placeholders with 1.95.0
- Bump stage0 to 1.95.0-beta.1
- Clear `STAGE0_MISSING_TARGETS`
- Update `cfg(bootstrap)`
- Reformat with the new stage0
@JonathanBrouwer
Rollup merge of rust-lang#152210 - Ozzy1423:attrs7, r=JonathanBrouwer
0da3785 
Gate #![reexport_test_harness_main] properly

Address the FIXME

Removed from `issue-43106-gating-of-builtin-attrs.rs` since that is for stable attributes only.

This would be a breaking change, search of github shows it is mostly but not always used with `#![test_runner]` which is already gated correctly.

Details:
rust-lang#50297

Feel free to close this issue if you think it is not worth addressing the FIXME...
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 7, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. 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-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer 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 7, 2026
@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Mar 7, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

📌 Commit 0da3785 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 Mar 7, 2026
@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Mar 7, 2026

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.

Sign in to view
rust-bors bot pushed a commit that referenced this pull request Mar 7, 2026
@bors
Auto merge of #153544 - JonathanBrouwer:rollup-LT1ogBG, r=<try>
ce95b87 
Rollup of 2 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

This comment has been minimized.

Sign in to view
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

☀️ Try build successful (CI)
Build commit: ce95b87 (ce95b87e9cc5b5811de282ed8bf02728bd47a846, parent: 085c58f2c0c7db692a2eaf2b8970ff474eed9183)

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

rust-bors bot commented Mar 7, 2026

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

@rust-bors rust-bors bot merged commit e370b60 into rust-lang:main Mar 7, 2026
13 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 7, 2026
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 7, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152210 Gate #![reexport_test_harness_main] properly 0af089d8e4918c4bd1e72c57f8ecf093b8319a30 (link)
#153462 Bootstrap update e6c7d3cfd0d8e1f4f6f2ad72fd4945f91ba42d83 (link)

previous master: e3d66fe39a

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 7, 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 e3d66fe (parent) -> e370b60 (this PR)

Test differences

Show 802 test diffs

802 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 e370b60cf2b0d3e4b55923ec1558c5b5f8970cfb --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. pr-check-1: 25m 11s -> 34m 43s (+37.8%)
  2. tidy: 2m 42s -> 3m 36s (+33.4%)
  3. aarch64-gnu-llvm-20-1: 54m 45s -> 1h 8m (+25.1%)
  4. x86_64-gnu-gcc: 1h -> 1h 10m (+17.3%)
  5. x86_64-gnu-tools: 55m 55s -> 1h 5m (+16.5%)
  6. aarch64-gnu-llvm-20-2: 47m 55s -> 53m 14s (+11.1%)
  7. pr-check-2: 40m 5s -> 44m 19s (+10.6%)
  8. x86_64-gnu-distcheck: 2h 23m -> 2h 9m (-10.2%)
  9. dist-i686-linux: 1h 43m -> 1h 53m (+9.7%)
  10. x86_64-gnu-llvm-20-2: 1h 32m -> 1h 41m (+9.5%)
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.

This was referenced Mar 7, 2026
Open
Draft
Open
Open
Open
Open
Open
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 8, 2026

Finished benchmarking commit (e370b60): 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)		 -0.1% [-0.1%, -0.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.4%, secondary -0.8%)

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

mean range count
Regressions ❌
(primary)		 5.6% [5.6%, 5.6%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.3% [-1.6%, -1.0%] 3
Improvements ✅
(secondary)		 -0.8% [-0.8%, -0.8%] 1
All ❌✅ (primary) 0.4% [-1.6%, 5.6%] 4

Cycles

Results (secondary 1.9%)

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)		 1.9% [1.5%, 2.3%] 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: 478.012s -> 485.77s (1.62%)
Artifact size: 397.02 MiB -> 395.01 MiB (-0.51%)

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

Reviewers

No reviews

Assignees

No one assigned

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. 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-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer 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

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

5 participants

@JonathanBrouwer @rust-timer @rustbot @Ozzy1423 @cuviper