-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Edition 2024: don't special-case diverging blocks as much #123590
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -441,7 +441,16 @@ fn parse_never_type_options_attr( | |
| if tcx.features().never_type_fallback { FallbackToNiko } else { FallbackToUnit } | ||
| }); | ||
|
|
||
| let block = block.unwrap_or_default(); | ||
| let block = block.unwrap_or_else(|| default_diverging_block_behavior(tcx)); | ||
|
|
||
| (fallback, block) | ||
| } | ||
|
|
||
| /// Returns the edition-based default diverging block behavior | ||
| fn default_diverging_block_behavior(tcx: TyCtxt<'_>) -> DivergingBlockBehavior { | ||
| if tcx.sess.edition().at_least_rust_2024() { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this right? Couldn't the block come from an older-edition macro? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not right, good point. I was thinking so much about the never type fallback change (which has to be crate-global) that I forgot we can have more local things 🙈 Will change it to check the edition per-block. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we put this behind a feature gate? Especially if it's for experimenting. We can make a "stabilization PR" that removes the need for the gate once it's settled. |
||
| return DivergingBlockBehavior::Unit; | ||
| } | ||
|
|
||
| DivergingBlockBehavior::Never | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
tests/ui/editions/diverging-block.e2024.fixed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| //@ revisions: e2021 e2024 | ||
| // | ||
| //@[e2021] edition: 2021 | ||
| //@[e2024] edition: 2024 | ||
| //@[e2024] compile-flags: -Zunstable-options | ||
| // | ||
| //@[e2021] check-pass | ||
| //@[e2024] check-fail | ||
| // | ||
| //@[e2024] run-rustfix | ||
|
|
||
|
|
||
| fn main() { | ||
| // a diverging block, with no tail expression. | ||
| // | ||
| // edition <= 2021: the block has type `!`, which then can be coerced. | ||
| // edition >= 2024: the block has type `()`, as with any block with no tail. | ||
| let _: u32 = { //[e2024]~ error: mismatched types | ||
| return | ||
| }; | ||
| } | ||
|
|
||
| fn _f() { | ||
| // Same as the above, but with an if | ||
| if true { | ||
| return | ||
| } else { | ||
| 0_u32 //[e2024]~ error: `if` and `else` have incompatible types | ||
| }; | ||
| } |
28 changes: 28 additions & 0 deletions
tests/ui/editions/diverging-block.e2024.stderr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| error[E0308]: mismatched types | ||
| --> $DIR/diverging-block.rs:18:18 | ||
| | | ||
| LL | let _: u32 = { | ||
| | __________________^ | ||
| LL | | return; | ||
| | | - help: remove this semicolon to return this value | ||
| LL | | }; | ||
| | |_____^ expected `u32`, found `()` | ||
|
|
||
| error[E0308]: `if` and `else` have incompatible types | ||
| --> $DIR/diverging-block.rs:28:9 | ||
| | | ||
| LL | / if true { | ||
| LL | | return; | ||
| | | ------- | ||
| | | | | | ||
| | | | help: consider removing this semicolon | ||
| | | expected because of this | ||
| LL | | } else { | ||
| LL | | 0_u32 | ||
| | | ^^^^^ expected `()`, found `u32` | ||
| LL | | }; | ||
| | |_____- `if` and `else` have incompatible types | ||
|
|
||
| error: aborting due to 2 previous errors | ||
|
|
||
| For more information about this error, try `rustc --explain E0308`. |
30 changes: 30 additions & 0 deletions
tests/ui/editions/diverging-block.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| //@ revisions: e2021 e2024 | ||
| // | ||
| //@[e2021] edition: 2021 | ||
| //@[e2024] edition: 2024 | ||
| //@[e2024] compile-flags: -Zunstable-options | ||
| // | ||
| //@[e2021] check-pass | ||
| //@[e2024] check-fail | ||
| // | ||
| //@[e2024] run-rustfix | ||
|
|
||
|
|
||
| fn main() { | ||
| // a diverging block, with no tail expression. | ||
| // | ||
| // edition <= 2021: the block has type `!`, which then can be coerced. | ||
| // edition >= 2024: the block has type `()`, as with any block with no tail. | ||
| let _: u32 = { //[e2024]~ error: mismatched types | ||
| return; | ||
| }; | ||
| } | ||
|
|
||
| fn _f() { | ||
| // Same as the above, but with an if | ||
| if true { | ||
| return; | ||
| } else { | ||
| 0_u32 //[e2024]~ error: `if` and `else` have incompatible types | ||
| }; | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.