Skip to content

Rollup of 7 pull requests #144294

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 22 commits into from
Jul 22, 2025
Merged

Rollup of 7 pull requests #144294

merged 22 commits into from
Jul 22, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jul 22, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tomtor and others added 22 commits June 13, 2025 13:56
this makes us less vulnerable to MITM and supply chain attacks.

it also means that the CI scripts are no longer responsible for
tracking the versions of these tools.

it should also avoid the situation where local tsc and CI
disagree on the presense of errors due to them being different versions.
in MSYS2 we have problems with stage0 for *-gnullvm hosts because prebuilt dist tarballs will be
available starting from 1.90.0-beta. also this change helps to match bootstrap.toml config
add test for lld opt in and also add thread_local defined state to change opt in targets

make the config lld test parameter smoother to work, and have no_llvm_config set even when target_config is not present
Add modern AVR mcus like avr128db28 and attiny3224

Related to llvm/llvm-project#143914

r? ```@Patryk27```
… r=Kobzol

tidy: move rustdoc js stuff into a tidy extra check

Most of these were factored out of CI scripts, but `eslint` in particular was previously implemented with its own special cased logic.

A new option has been added to bootstrap, `build.tidy-extra-checks`, which serves as a default value for the `--extra-checks` flag.  This is mostly for the benefit of rustdoc js maintainers, but should also help bootstrap py maintainers.

Additionally, `--extra-checks=cpp` has been documented.

I'm not super happy with how long the extra check names are in comparison to the others (in particular `typecheck`), but I couldn't think of anything better (I didn't want to name it `tsc` on the off chance we want to switch to a different typechecking engine in the future).

It would be nice to convert the extra checks arg into a proper enum, both for warning on unknown values and to provide better shell completion.

r? ```@GuillaumeGomez```

Fixes: rust-lang#144093
…, r=petrochenkov

Unquerify maybe_unused_trait_imports.

Based on rust-lang#143247
r? ```@ghost``` for perf
…ochenkov

tests: cover more `exported_private_dependencies` cases

This PR adds tests for all missing cases from rust-lang#71043 and some on top of that. I believe with this, that issue can be closed.

Some of the lints can be improved, e.g. `provided_impl_trait` and `impl From<PublicWithStdImpl> for OtherType` lint twice.

cc ```@epage``` in case you want to double check I didn't miss anything.
…onfig-issue, r=Kobzol

Fix empty target_config in apply_rust_config bootstrap

This PR fixes the issue of an empty target_config in apply_rust_config, which was caused by the ordering of TOML config parsing. This was inadvertently introduced during the last config refactor. The test and the corresponding configuration order have been corrected in this PR.

r? ```@Kobzol```
…bzol

 opt-dist: add an option for setting path to stage0 root

in MSYS2 we have problems with stage0 for *-gnullvm hosts because prebuilt dist tarballs will be
available starting from 1.90.0-beta. also this change helps to match bootstrap.toml config

r? Kobzol

try-job: dist-x86_64-msvc
try-job: dist-x86_64-linux
Dont ICE on copy error being suppressed due to overflow

See comment in test file.

Fixes rust-lang#144165
@rustbot rustbot added A-CI Area: Our Github Actions CI A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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. labels Jul 22, 2025
@rustbot rustbot added T-infra Relevant to the infrastructure 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. rollup A PR which is a rollup labels Jul 22, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 22, 2025

📌 Commit 749f895 has been approved by matthiaskrgr

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

bors commented Jul 22, 2025

⌛ Testing commit 749f895 with merge 35487a2...

@bors
Copy link
Collaborator

bors commented Jul 22, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 35487a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2025
@bors bors merged commit 35487a2 into rust-lang:master Jul 22, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 22, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#142454 Add modern AVR mcus like avr128db28 and attiny3224 e8d642e4436b25cf863ad299b2b11391fe5b6adf (link)
#142924 tidy: move rustdoc js stuff into a tidy extra check eb309dfcc8e30aebeedc84fa298c4282705c164c (link)
#143373 Unquerify maybe_unused_trait_imports. ab89d8e7dd61f5ef70b2cad2a8cf421b41972ed3 (link)
#144082 tests: cover more exported_private_dependencies cases 984f0fc7a30b0a78e93e93775bc21d86dbbc8c77 (link)
#144126 Fix empty target_config in apply_rust_config bootstrap 2cebb0346b8ec836e6268b80d7df8430e9ffcdc9 (link)
#144164 opt-dist: add an option for setting path to stage0 root 78245f57344f606051c629f99a813c745de6b712 (link)
#144265 Dont ICE on copy error being suppressed due to overflow 00776a7a6df48851336ca812c55ac26d05600421 (link)

previous master: c0b282f0cc

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

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 c0b282f (parent) -> 35487a2 (this PR)

Test differences

Show 6 test diffs

Stage 0

  • core::builder::tests::snapshot::test_lld_opt_in: [missing] -> pass (J1)

Stage 1

  • [ui] tests/ui/borrowck/copy-overflow.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/borrowck/copy-overflow.rs: [missing] -> pass (J0)

Additionally, 3 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 35487a2e7c80012129c38f55c970109a1538c91f --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. tidy: 62.0s -> 97.9s (57.9%)
  2. dist-x86_64-apple: 9279.4s -> 13292.7s (43.2%)
  3. pr-check-1: 1858.2s -> 1514.6s (-18.5%)
  4. pr-check-2: 2587.3s -> 2124.9s (-17.9%)
  5. x86_64-rust-for-linux: 3061.4s -> 2568.1s (-16.1%)
  6. dist-x86_64-netbsd: 4615.6s -> 5217.7s (13.0%)
  7. dist-apple-various: 8708.3s -> 9840.3s (13.0%)
  8. x86_64-gnu-tools: 3815.7s -> 3375.1s (-11.5%)
  9. x86_64-apple-1: 8780.1s -> 7875.1s (-10.3%)
  10. aarch64-gnu-debug: 4116.3s -> 3731.1s (-9.4%)
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 (35487a2): comparison URL.

Overall result: ❌ regressions - 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.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -3.3%)

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

Cycles

Results (secondary -0.6%)

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

Binary size

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

Bootstrap: 463.984s -> 465.187s (0.26%)
Artifact size: 374.67 MiB -> 374.60 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-CI Area: Our Github Actions CI A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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-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-infra Relevant to the infrastructure 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
Development

Successfully merging this pull request may close these issues.