nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve clarity of diagnostic message on non-exhaustive matches

Browse Source
This commit is contained in:
Sebastian Toh 2023-09-03 19:55:11 +08:00
parent 43dd8613a3
commit d87b87d10e
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_mir_build/src/thir/pattern/check_match.rs
View File

@ -741,10 +741,10 @@ fn non_exhaustive_match<'p, 'tcx>(
} }
} else if ty == cx.tcx.types.str_ { } else if ty == cx.tcx.types.str_ {
err.note(format!( err.note(format!(
"`{ty}` cannot be matched exhaustively, so a wildcard `_` is necessary", "`&str` cannot be matched exhaustively, so a wildcard `_` is necessary",
)); ));
} else if cx.is_foreign_non_exhaustive_enum(ty) { } else if cx.is_foreign_non_exhaustive_enum(ty) {
err.note(format!("`{ty}` is marked as non-exhaustive")); err.note(format!("`{ty}` is marked as non-exhaustive, so a wildcard `_` is necessary to match exhaustively"));
} }
} }
} }

2
tests/ui/closures/2229_closure_analysis/match/non-exhaustive-match.stderr
View File

@ -46,7 +46,7 @@ note: `E2` defined here
LL | pub enum E2 { A, B } LL | pub enum E2 { A, B }
| ^^^^^^^^^^^ | ^^^^^^^^^^^
= note: the matched value is of type `E2` = note: the matched value is of type `E2`
= note: `E2` is marked as non-exhaustive = note: `E2` is marked as non-exhaustive, so a wildcard `_` is necessary to match exhaustively
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL | let _e = || { match e2 { E2::A => (), E2::B => (), _ => todo!() } }; LL | let _e = || { match e2 { E2::A => (), E2::B => (), _ => todo!() } };

2
tests/ui/match/match_non_exhaustive.stderr
View File

@ -46,7 +46,7 @@ note: `E2` defined here
LL | pub enum E2 { A, B } LL | pub enum E2 { A, B }
| ^^^^^^^^^^^ | ^^^^^^^^^^^
= note: the matched value is of type `E2` = note: the matched value is of type `E2`
= note: `E2` is marked as non-exhaustive = note: `E2` is marked as non-exhaustive, so a wildcard `_` is necessary to match exhaustively
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL | match e2 { E2::A => (), E2::B => (), _ => todo!() }; LL | match e2 { E2::A => (), E2::B => (), _ => todo!() };

2
tests/ui/pattern/usefulness/issue-105479-str-non-exhaustiveness.rs
View File

@ -5,7 +5,7 @@ fn main() {
//~^ ERROR non-exhaustive patterns: `(&_, _)` not covered [E0004] //~^ ERROR non-exhaustive patterns: `(&_, _)` not covered [E0004]
//~| NOTE pattern `(&_, _)` not covered //~| NOTE pattern `(&_, _)` not covered
//~| NOTE the matched value is of type `(&str, &str)` //~| NOTE the matched value is of type `(&str, &str)`
//~| NOTE `str` cannot be matched exhaustively, so a wildcard `_` is necessary //~| NOTE `&str` cannot be matched exhaustively, so a wildcard `_` is necessary
("a", "b") => {} ("a", "b") => {}
("c", "d") => {} ("c", "d") => {}
} }

2
tests/ui/pattern/usefulness/issue-105479-str-non-exhaustiveness.stderr
View File

@ -5,7 +5,7 @@ LL | match (a, b) {
| ^^^^^^ pattern `(&_, _)` not covered | ^^^^^^ pattern `(&_, _)` not covered
| |
= note: the matched value is of type `(&str, &str)` = note: the matched value is of type `(&str, &str)`
= note: `str` cannot be matched exhaustively, so a wildcard `_` is necessary = note: `&str` cannot be matched exhaustively, so a wildcard `_` is necessary
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL ~ ("c", "d") => {}, LL ~ ("c", "d") => {},

4
tests/ui/pattern/usefulness/issue-30240.stderr
View File

@ -5,7 +5,7 @@ LL | match "world" {
| ^^^^^^^ pattern `&_` not covered | ^^^^^^^ pattern `&_` not covered
| |
= note: the matched value is of type `&str` = note: the matched value is of type `&str`
= note: `str` cannot be matched exhaustively, so a wildcard `_` is necessary = note: `&str` cannot be matched exhaustively, so a wildcard `_` is necessary
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL ~ "hello" => {}, LL ~ "hello" => {},
@ -19,7 +19,7 @@ LL | match "world" {
| ^^^^^^^ pattern `&_` not covered | ^^^^^^^ pattern `&_` not covered
| |
= note: the matched value is of type `&str` = note: the matched value is of type `&str`
= note: `str` cannot be matched exhaustively, so a wildcard `_` is necessary = note: `&str` cannot be matched exhaustively, so a wildcard `_` is necessary
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL ~ "hello" => {}, LL ~ "hello" => {},

2
tests/ui/pattern/usefulness/nested-non-exhaustive-enums.stderr
View File

@ -10,7 +10,7 @@ note: `Option<NonExhaustiveEnum>` defined here
| |
= note: not covered = note: not covered
= note: the matched value is of type `Option<NonExhaustiveEnum>` = note: the matched value is of type `Option<NonExhaustiveEnum>`
= note: `NonExhaustiveEnum` is marked as non-exhaustive = note: `NonExhaustiveEnum` is marked as non-exhaustive, so a wildcard `_` is necessary to match exhaustively
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL ~ None => {}, LL ~ None => {},

2
tests/ui/rfcs/rfc-2008-non-exhaustive/enum.stderr
View File

@ -29,7 +29,7 @@ note: `NonExhaustiveEnum` defined here
LL | pub enum NonExhaustiveEnum { LL | pub enum NonExhaustiveEnum {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: the matched value is of type `NonExhaustiveEnum` = note: the matched value is of type `NonExhaustiveEnum`
= note: `NonExhaustiveEnum` is marked as non-exhaustive = note: `NonExhaustiveEnum` is marked as non-exhaustive, so a wildcard `_` is necessary to match exhaustively
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
| |
LL ~ NonExhaustiveEnum::Struct { .. } => "third", LL ~ NonExhaustiveEnum::Struct { .. } => "third",