mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #55664 - varkor:all-possible-cases-message, r=zackmdavis

Browse Source 
Make "all possible cases" help message uniform with existing help messages

Specifically no capitalisation or trailing full stops.
This commit is contained in:
kennytm 2018-11-06 15:21:06 +08:00
commit 435aca1c8f
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_mir/hair/pattern/check_match.rs
View File

@ -238,8 +238,8 @@ impl<'a, 'tcx> MatchVisitor<'a, 'tcx> {
is non-empty",
pat_ty));
span_help!(&mut err, scrut.span,
"Please ensure that all possible cases are being handled; \
possibly adding wildcards or more match arms.");
"ensure that all possible cases are being handled, \
possibly by adding wildcards or more match arms");
err.emit();
}
// If the type *is* uninhabited, it's vacuously exhaustive

2
src/test/ui/error-codes/E0004-2.stderr
View File

@ -4,7 +4,7 @@ error[E0004]: non-exhaustive patterns: type std::option::Option<i32> is non-empt
LL | match x { } //~ ERROR E0004
| ^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/E0004-2.rs:14:11
|
LL | match x { } //~ ERROR E0004

2
src/test/ui/issues/issue-3096-1.stderr
View File

@ -4,7 +4,7 @@ error[E0004]: non-exhaustive patterns: type () is non-empty
LL | match () { } //~ ERROR non-exhaustive
| ^^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/issue-3096-1.rs:12:11
|
LL | match () { } //~ ERROR non-exhaustive

2
src/test/ui/issues/issue-3096-2.stderr
View File

@ -4,7 +4,7 @@ error[E0004]: non-exhaustive patterns: type *const bottom is non-empty
LL | match x { } //~ ERROR non-exhaustive patterns
| ^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/issue-3096-2.rs:15:11
|
LL | match x { } //~ ERROR non-exhaustive patterns

6
src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr
View File

@ -10,7 +10,7 @@ error[E0004]: non-exhaustive patterns: type &Void is non-empty
LL | let _ = match x {}; //~ ERROR non-exhaustive
| ^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/uninhabited-matches-feature-gated.rs:20:19
|
LL | let _ = match x {}; //~ ERROR non-exhaustive
@ -22,7 +22,7 @@ error[E0004]: non-exhaustive patterns: type (Void,) is non-empty
LL | let _ = match x {}; //~ ERROR non-exhaustive
| ^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/uninhabited-matches-feature-gated.rs:23:19
|
LL | let _ = match x {}; //~ ERROR non-exhaustive
@ -34,7 +34,7 @@ error[E0004]: non-exhaustive patterns: type [Void; 1] is non-empty
LL | let _ = match x {}; //~ ERROR non-exhaustive
| ^
|
help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
--> $DIR/uninhabited-matches-feature-gated.rs:26:19
|
LL | let _ = match x {}; //~ ERROR non-exhaustive