Skip to content

Fix feature gating for new try bikeshed expressions #152519

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
Open
scottmcm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix feature gating for new try bikeshed expressions #152519

scottmcm wants to merge 1 commit into from
+47 −7

Conversation

@scottmcm
Copy link
Member

@scottmcm scottmcm commented Feb 12, 2026 •
edited by rustbot
Loading

r? fmease
Fixes #152501

@rustbot rustbot added 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. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Feb 12, 2026
lqd
lqd reviewed Feb 12, 2026
View reviewed changes
tests/ui/try-block/try-block-homogeneous-pre-expansion.rs Outdated
@@ -0,0 +1,12 @@
//@ run-pass
Copy link
Member

@lqd lqd Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering: does this need to run?

Copy link
Member Author

@scottmcm scottmcm Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, probably not. You're thinking check-pass instead?

Copy link
Member

@lqd lqd Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. It should be enough, right? Since this is in the frontend, it shouldn't need codegen (which is the build-pass variety), and check should work.

Copy link
Member

@fmease fmease Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, check-pass more than suffices.

fmease
fmease approved these changes Feb 12, 2026
View reviewed changes
Copy link
Member

@fmease fmease left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! r=me with build-pass → check-pass @bors rollup

View changes since this review

tests/ui/try-block/try-block-homogeneous-pre-expansion.rs Outdated
@@ -0,0 +1,12 @@
//@ run-pass
Copy link
Member

@fmease fmease Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, check-pass more than suffices.

tests/ui/try-block/try-block-heterogeneous-pre-expansion.rs Outdated
Copy link
Member

@fmease fmease Feb 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usually I put test cases that ensure the feature gate happens before expansion in the dedicated tests/ui/feature-gates/feature-gate-$FEATURE.rs right next to the other test cases. I guess a separate test file is also fine.

Copy link
Member Author

@scottmcm scottmcm Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I wasn't sure that both in the same file worked. If that's normal, then great, I'd rather not have another file.

I kept the homogeneous one in the separate file because the warning seems to only be there when the error didn't happen earlier (which is good).

@fmease fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2026
fmease
fmease approved these changes Feb 12, 2026
View reviewed changes
Copy link
Member

@fmease fmease left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! @bors r+

View changes since this review

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 12, 2026

📌 Commit 6afebcc has been approved by fmease

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 12, 2026
Zalathar added a commit to Zalathar/rust that referenced this pull request Feb 13, 2026
@Zalathar
Rollup merge of rust-lang#152519 - scottmcm:fix-152501, r=fmease
a0c9e99 
Fix feature gating for new `try bikeshed` expressions

r? fmease
Fixes rust-lang#152501
@Zalathar Zalathar mentioned this pull request Feb 13, 2026
Closed
rust-bors bot pushed a commit that referenced this pull request Feb 13, 2026
@bors
Auto merge of #152560 - Zalathar:rollup-yZyzymz, r=Zalathar
e1cd622 
Rollup of 18 pull requests

Successful merges:

 - #150551 (Compute localized outlives constraints lazily)
 - #150752 (Update libc to v0.2.181)
 - #150988 (Improve code suggestion for incorrect macro_rules! usage)
 - #152422 (Change query proc macro to be more rust-analyzer friendly)
 - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto)
 - #152514 (Collect active query jobs into struct `QueryJobMap`)
 - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`)
 - #152528 (Support serializing CodegenContext)
 - #152082 (Move tests)
 - #152232 (Add must_use for FileTimes)
 - #152329 (Simplify parallel! macro)
 - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion)
 - #152486 (remove redundant backchain attribute in codegen)
 - #152519 (Fix feature gating for new `try bikeshed` expressions)
 - #152529 (sparc64: enable abi compatibility test)
 - #152548 (reject inline const patterns pre-expansion)
 - #152550 (Port #[prelude_import] to the attribute parser)
 - #152552 (Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks)
Zalathar added a commit to Zalathar/rust that referenced this pull request Feb 13, 2026
@Zalathar
Rollup merge of rust-lang#152519 - scottmcm:fix-152501, r=fmease
4269210 
Fix feature gating for new `try bikeshed` expressions

r? fmease
Fixes rust-lang#152501
@Zalathar Zalathar mentioned this pull request Feb 13, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lqd lqd lqd left review comments

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels

beta-nominated Nominated for backporting to the compiler in the beta channel. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

try bikeshed $ty { … } is not pre-expansion gated (affects beta+nightly)

4 participants

@scottmcm @lqd @fmease @rustbot