Point at return type when it influences non-first match arm
#114819
Merged
Conversation
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
|
r? @jackh726 (rustbot has picked a reviewer for you, use r? to override) |
| @@ -402,7 +402,7 @@ pub enum ObligationCauseCode<'tcx> { | |||
| OpaqueReturnType(Option<(Ty<'tcx>, Span)>), | |||
|
|
|||
| /// Block implicit return | |||
| BlockTailExpression(hir::HirId), | |||
| BlockTailExpression(hir::HirId, hir::HirId, hir::MatchSource), | |||
There was a problem hiding this comment.
Can you make these fields have names?
|
Some changes might have occurred in exhaustiveness checking cc @Nadrieril Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
When encountering code like
```rust
fn foo() -> i32 {
match 0 {
1 => return 0,
2 => "",
_ => 1,
}
}
```
Point at the return type and not at the prior arm, as that arm has type
`!` which isn't influencing the arm corresponding to arm `2`.
Fix rust-lang#78124.
compiler-errors
approved these changes
Aug 14, 2023
| @@ -98,7 +98,7 @@ fn if_same_then_else2() -> Result<&'static str, ()> { | |||
| }; | |||
|
|
|||
| if true { | |||
| //~^ ERROR: this `if` has identical blocks | |||
| // FIXME: should emit "this `if` has identical blocks" | |||
There was a problem hiding this comment.
Do you know why this regressed?
|
@bors r+ |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 15, 2023
…rrors
Point at return type when it influences non-first `match` arm
When encountering code like
```rust
fn foo() -> i32 {
match 0 {
1 => return 0,
2 => "",
_ => 1,
}
}
```
Point at the return type and not at the prior arm, as that arm has type `!` which isn't influencing the arm corresponding to arm `2`.
Fix rust-lang#78124.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 15, 2023
…rrors
Point at return type when it influences non-first `match` arm
When encountering code like
```rust
fn foo() -> i32 {
match 0 {
1 => return 0,
2 => "",
_ => 1,
}
}
```
Point at the return type and not at the prior arm, as that arm has type `!` which isn't influencing the arm corresponding to arm `2`.
Fix rust-lang#78124.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 15, 2023
…rrors
Point at return type when it influences non-first `match` arm
When encountering code like
```rust
fn foo() -> i32 {
match 0 {
1 => return 0,
2 => "",
_ => 1,
}
}
```
Point at the return type and not at the prior arm, as that arm has type `!` which isn't influencing the arm corresponding to arm `2`.
Fix rust-lang#78124.
This was referenced Aug 15, 2023
flip1995
reviewed
Aug 15, 2023
| @@ -149,7 +149,7 @@ fn expr_search_pat(tcx: TyCtxt<'_>, e: &Expr<'_>) -> (Pat, Pat) { | |||
| (Pat::Str("for"), Pat::Str("}")) | |||
| }, | |||
| ExprKind::Match(_, _, MatchSource::Normal) => (Pat::Str("match"), Pat::Str("}")), | |||
| ExprKind::Match(e, _, MatchSource::TryDesugar) => (expr_search_pat(tcx, e).0, Pat::Str("?")), | |||
| ExprKind::Match(e, _, MatchSource::TryDesugar(_)) => (expr_search_pat(tcx, e).0, Pat::Str("?")), | |||
There was a problem hiding this comment.
This might be the reason for the Clippy regression. Did the expression e that is stored in the ExprKind::Match change by any chance and that's why re-calling expr_search_pat leads to different results than before? 🤔
(Pretty wild guess)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 15, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#114588 (Improve docs for impl Default for ExitStatus) - rust-lang#114619 (Fix pthread_attr_union layout on Wasi) - rust-lang#114644 (Point out expectation even if we have `TypeError::RegionsInsufficientlyPolymorphic`) - rust-lang#114668 (Deny `FnDef` in patterns) - rust-lang#114819 (Point at return type when it influences non-first `match` arm) - rust-lang#114826 (Fix typos) - rust-lang#114837 (add missing feature(error_in_core)) - rust-lang#114853 (Migrate GUI colors test to original CSS color format) r? `@ghost` `@rustbot` modify labels: rollup
estebank
added a commit
to estebank/rust
that referenced
this pull request
Aug 23, 2023
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 23, 2023
Fix clippy lint for identical `if`/`else` contraining `?` expressions Follow up to rust-lang#114819.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Aug 23, 2023
Fix clippy lint for identical `if`/`else` contraining `?` expressions Follow up to rust-lang#114819.
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Aug 24, 2023
…rrors
Point at return type when it influences non-first `match` arm
When encountering code like
```rust
fn foo() -> i32 {
match 0 {
1 => return 0,
2 => "",
_ => 1,
}
}
```
Point at the return type and not at the prior arm, as that arm has type `!` which isn't influencing the arm corresponding to arm `2`.
Fix rust-lang#78124.
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Aug 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When encountering code like
Point at the return type and not at the prior arm, as that arm has type
!which isn't influencing the arm corresponding to arm2.Fix #78124.