Skip to content

Rollup of 6 pull requests #141906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 80 commits into from
Jun 2, 2025
Merged

Rollup of 6 pull requests #141906

merged 80 commits into from
Jun 2, 2025

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Jun 2, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Lysxia and others added 30 commits May 14, 2025 11:36
Normally I refrain from nit picking, but this seamed worth it.
Small typo and style fixes in  binders.md
The order might have been reversed at some point, leading to the two
chapters talking about each other in the wrong order.
Fix misdirected link for `TypingEnv`
Update links between ty-module and binders
Make it clear we talk about early bound params
It does not do any line matching, so it should be separated from the other types.
Now that CI has been finally migrated to `rust-lang/rust`.
document why rustdoc cannot look at function bodies
rustdoc.md: reorder list so test suites are not split up
…-lang-ci

Remove mentions of rust-lang-ci/rust
Update `rustc_on_unimplemented` docs
…s-yes

Flesh out sections about crashes tests and update mentions of glacier
Add time reference and tracking info for trait system refactor
tshepang and others added 10 commits June 2, 2025 11:55
They couldn't be executed locally before due to some additional environment reads.
allow macro_use as first segment

Fixes rust-lang#140255

This issue may raise a question: It's reasonable an external crate name or import target be legally named `macro_use`?
…sgx_maintainers, r=Noratrieb

[RTE-484] Update SGX maintainers

`@mzohreva` is no longer with Fortanix. We need to change the SGX maintainers accordingly.
…n-crate, r=petrochenkov

Fix false positive lint error from no_implicit_prelude attr

Fixes rust-lang#141785

r? `@petrochenkov`
rustc-dev-guide subtree update

r? `@ghost`
Fix citool tests when executed locally

They couldn't be executed locally before due to some additional environment reads.

I also investigated the annoying rebuilds that we see on CI all the time, and they are caused by `ring`'s build script. It should be fixed in the next ring release (briansmith/ring#2525), so we can just wait for that and then update `ring`.

r? `@marcoieni`
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 2, 2025
@chenyukang
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 2, 2025

📌 Commit 8f240de has been approved by chenyukang

It is now in the queue for this repository.

@bors bors 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 2, 2025
@bors
Copy link
Collaborator

bors commented Jun 2, 2025

⌛ Testing commit 8f240de with merge 449c801...

@bors
Copy link
Collaborator

bors commented Jun 2, 2025

☀️ Test successful - checks-actions
Approved by: chenyukang
Pushing 449c801 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 2, 2025
@bors bors merged commit 449c801 into rust-lang:master Jun 2, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 2, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#141884 allow macro_use as first segment a2ba15570f6c006e3f351e5b8650869900700421 (link)
#141885 [RTE-484] Update SGX maintainers a5550242e35b88cf15a63359aaed9030270d5a7e (link)
#141892 Fix false positive lint error from no_implicit_prelude attr 762ae24f3e6d096e3a2202ccaa853897f2794619 (link)
#141894 rustc-dev-guide subtree update e28b80446d7399e23da543309cf2ca87b656d664 (link)
#141895 tshepang has a new email 173419a780ce13ecb9dcbe73cd21bfd341db71a5 (link)
#141897 Fix citool tests when executed locally 3b3002bc79935baf6e335662961b3d0b2cfba196 (link)

previous master: 2398bd60ef

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link
Contributor

github-actions bot commented Jun 2, 2025

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 2398bd6 (parent) -> 449c801 (this PR)

Test differences

Show 8 test diffs

Stage 1

  • [crashes] tests/crashes/140255.rs: pass -> [missing] (J2)
  • [ui] tests/ui/attributes/illegal-macro-use.rs: [missing] -> pass (J2)
  • [ui] tests/ui/attributes/use-extern-crate-named-macro-use.rs: [missing] -> pass (J2)
  • [ui] tests/ui/resolve/extern-crate-lint-issue-141785.rs: [missing] -> pass (J2)

Stage 2

  • [crashes] tests/crashes/140255.rs: pass -> [missing] (J0)
  • [ui] tests/ui/attributes/illegal-macro-use.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/use-extern-crate-named-macro-use.rs: [missing] -> pass (J1)
  • [ui] tests/ui/resolve/extern-crate-lint-issue-141785.rs: [missing] -> pass (J1)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 449c801783ecef2aad3ae03d6c9e4ac007de7d4b --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-apple-2: 4565.1s -> 6204.1s (35.9%)
  2. dist-x86_64-apple: 9662.7s -> 11264.8s (16.6%)
  3. x86_64-apple-1: 9426.5s -> 10879.8s (15.4%)
  4. dist-apple-various: 7420.4s -> 6713.7s (-9.5%)
  5. dist-aarch64-apple: 6000.7s -> 6546.8s (9.1%)
  6. x86_64-msvc-2: 6951.5s -> 6430.5s (-7.5%)
  7. x86_64-gnu-aux: 5483.7s -> 5811.9s (6.0%)
  8. aarch64-apple: 5717.3s -> 5416.7s (-5.3%)
  9. aarch64-gnu: 6516.6s -> 6856.9s (5.2%)
  10. x86_64-msvc-ext1: 7114.5s -> 6787.0s (-4.6%)
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 (449c801): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary 1.8%, secondary -0.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.8% [1.8%, 1.8%] 1
Regressions ❌
(secondary)
0.6% [0.4%, 0.7%] 5
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.9% [-2.1%, -0.4%] 11
All ❌✅ (primary) 1.8% [1.8%, 1.8%] 1

Cycles

Results (secondary -0.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.6% [0.4%, 0.8%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.4% [-3.6%, -0.5%] 7
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 743.192s -> 744.828s (0.22%)
Artifact size: 372.27 MiB -> 372.28 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.