Skip to content

Rollup of 4 pull requests #148938

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 11 commits into from
Nov 14, 2025
Merged

Rollup of 4 pull requests #148938

merged 11 commits into from
Nov 14, 2025
+184 −49

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Nov 14, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

chenyukang and others added 11 commits November 8, 2025 09:41
@chenyukang
Fix ICE for repr simd on non struct
112d833
@scottmcm
Implement the alternative try desugaring
86c3ba7
@scottmcm
Add a UI test with code that only works with homogeneous try
cc7f844
@chenyukang
Add note for option llvm.download-ci-llvm
93a5c82
@ywxt @Zoxc
Lock shards while collecting active jobs.
a4d0507 
Co-authored-by: Zoxc <zoxc32@gmail.com>
@scottmcm
Move into_try_type to a free function
e5803fc
@chenyukang
add Tainted for NonAsmTypeReason
1610851
@Zalathar
Rollup merge of rust-lang#148638 - chenyukang:yukang-fix-148634-repr-…
bf7d553 
…simd-enum-ice, r=Kivooeo,lcnr

Fix ICE for repr simd on non struct

Fixes rust-lang#148634

The ICE happened because
https://github.com/rust-lang/rust/blob/995c11894fdabe1c630694254de756f82389c6cf/compiler/rustc_middle/src/ty/mod.rs#L1531

will always set `IS_SIMD` according to `get_all_attrs`, and since we already report error `attribute should be applied to a struct`, it's OK to bypass here.
@Zalathar
Rollup merge of rust-lang#148725 - scottmcm:experiment-new-try-block-…
f61bfb0 
…v3, r=petrochenkov

Implement the alternative `try` block desugaring

As discussed in rust-lang/rfcs#3721 (comment), update the `try` in nightly to match the RFC as a way to experiment.

This addresses the following unresolved issue from rust-lang#31436

>  Address issues with type inference (`try { expr? }?` currently requires an explicit type annotation somewhere).
@Zalathar
Rollup merge of rust-lang#148777 - ywxt:depth_limit_error, r=petroche…
e5690e7 
…nkov

Lock shards while emitting depth limit error.

Locking shards avoids collect_active_jobs isn't able to be completed during emitting depth limit error.

fix rust-lang#142159

Zulip: https://rust-lang.zulipchat.com/#narrow/channel/187679-t-compiler.2Fparallel-rustc/topic/panic.20while.20depth_limit_error/with/554616169

cc `@Zoxc`
@Zalathar
Rollup merge of rust-lang#148933 - chenyukang:yukang-add-note-bootstr…
33eb5c2 
…ap, r=Kobzol

Add note for option llvm.download-ci-llvm

From https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/.E2.9C.94.20Updating.20llvm.20submodule.20may.20cost.20much.20time.2C.20can.20we.20skip.2E.2E.2E/with/555335665

I found we already have related note in rustc-dev, it's more helpful to add this in exmaple configuration file.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) O-unix Operating system: Unix-like 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-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. rollup A PR which is a rollup labels Nov 14, 2025
@Zalathar
Copy link
Member Author

Zalathar commented Nov 14, 2025

Rollup of everything.

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 14, 2025

📌 Commit 33eb5c2 has been approved by Zalathar

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

bors commented Nov 14, 2025

⌛ Testing commit 33eb5c2 with merge c8551d3...

@bors
Copy link
Collaborator

bors commented Nov 14, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing c8551d3 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2025
@bors bors merged commit c8551d3 into rust-lang:main Nov 14, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 14, 2025
@rust-timer
Copy link
Collaborator

rust-timer commented Nov 14, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#148638 Fix ICE for repr simd on non struct 3767dd8f30867957b63290826dc2f04e8c325dc1 (link)
#148725 Implement the alternative try block desugaring 112edf6ac68505c7515722be71db57de6cbd473d (link)
#148777 Lock shards while emitting depth limit error. 3604d6b193486da3f2b7b7a36ced00653ec25788 (link)
#148933 Add note for option llvm.download-ci-llvm baac2b9fe23444a77289a4b6740006c01bc273f7 (link)

previous master: c880acdd31

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 Nov 14, 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 c880acd (parent) -> c8551d3 (this PR)

Test differences

Show 8 test diffs

Stage 1

  • [ui] tests/ui/asm/invalid-repr-simd-on-enum-148634.rs: [missing] -> pass (J1)
  • [ui] tests/ui/try-block/try-block-homogeneous.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/asm/invalid-repr-simd-on-enum-148634.rs: [missing] -> pass (J0)
  • [ui] tests/ui/try-block/try-block-homogeneous.rs: [missing] -> pass (J0)

Additionally, 4 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 c8551d3c63c51f290cf1dc9dc4714249ea849fd1 --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. aarch64-apple: 9346.4s -> 7171.6s (-23.3%)
  2. dist-x86_64-apple: 7150.4s -> 8581.8s (+20.0%)
  3. dist-aarch64-apple: 8033.7s -> 6618.1s (-17.6%)
  4. dist-apple-various: 4017.6s -> 3486.2s (-13.2%)
  5. x86_64-gnu-llvm-21-1: 3341.4s -> 3693.0s (+10.5%)
  6. dist-aarch64-msvc: 5480.1s -> 6048.9s (+10.4%)
  7. x86_64-gnu-llvm-20-1: 3240.9s -> 3563.0s (+9.9%)
  8. tidy: 154.0s -> 168.9s (+9.7%)
  9. aarch64-gnu: 6484.0s -> 7062.5s (+8.9%)
  10. x86_64-rust-for-linux: 3132.5s -> 2862.7s (-8.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.

@Zalathar Zalathar deleted the rollup-xg51707 branch November 14, 2025 12:18
@bors bors mentioned this pull request Nov 14, 2025
Open
@rust-timer
Copy link
Collaborator

rust-timer commented Nov 14, 2025

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

Max RSS (memory usage)

Results (secondary -1.8%)

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

Cycles

Results (secondary -1.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.8% [2.8%, 2.8%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.0% [-3.3%, -2.6%] 3
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.1%, 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)		 0.1% [0.0%, 0.2%] 12
Regressions ❌
(secondary)		 0.1% [0.0%, 0.1%] 6
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.1% [0.0%, 0.2%] 12

Bootstrap: 473.179s -> 473.369s (0.04%)
Artifact size: 388.67 MiB -> 388.69 MiB (0.01%)

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-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like 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-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

Milestone

1.93.0

Development

Successfully merging this pull request may close these issues.

7 participants

@Zalathar @bors @rust-timer @rustbot @chenyukang @scottmcm @ywxt