Specialize .. help message for all fields vs. the rest

camelid · camelid · commit fe82cc38a0b3 · 2021-01-12T19:25:50.000-08:00
diff --git a/compiler/rustc_typeck/src/check/pat.rs b/compiler/rustc_typeck/src/check/pat.rs
@@ -1071,14 +1071,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             if subpats.is_empty() || all_wildcards {
                 err.span_suggestion(
                     all_fields_span,
-                    "use `..` to ignore all unmentioned fields",
+                    "use `..` to ignore all fields",
                     String::from(".."),
                     Applicability::MaybeIncorrect,
                 );
             } else {
                 err.span_suggestion(
                     after_fields_span,
-                    "use `..` to ignore all unmentioned fields",
+                    "use `..` to ignore the rest of the fields",
                     String::from(", .."),
                     Applicability::MaybeIncorrect,
                 );
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr b/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
@@ -36,7 +36,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |     TupleStruct(_, _) = TupleStruct(1, 2);
    |                  ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |     TupleStruct(..) = TupleStruct(1, 2);
    |                 ^^
@@ -63,7 +63,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |     Enum::SingleVariant(_, _) = Enum::SingleVariant(1, 2);
    |                          ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |     Enum::SingleVariant(..) = Enum::SingleVariant(1, 2);
    |                         ^^
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
@@ -11,7 +11,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         Fruit::Apple(a, _) => {},
    |                       ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore the rest of the fields
    |
 LL |         Fruit::Apple(a, ..) => {},
    |                       ^^^^
diff --git a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr b/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
@@ -22,7 +22,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |     let P(_) = U {};
    |           ^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |     let P(..) = U {};
    |           ^^
diff --git a/src/test/ui/issues/issue-72574-2.stderr b/src/test/ui/issues/issue-72574-2.stderr
@@ -31,7 +31,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         Binder(_a, _x @ .., _) => {}
    |                           ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore the rest of the fields
    |
 LL |         Binder(_a, _x @ .., ..) => {}
    |                           ^^^^
diff --git a/src/test/ui/match/match-pattern-field-mismatch.stderr b/src/test/ui/match/match-pattern-field-mismatch.stderr
@@ -11,7 +11,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |           Color::Rgb(_, _, _) => { }
    |                          ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |           Color::Rgb(..) => { }
    |                      ^^
diff --git a/src/test/ui/pattern/issue-74539.stderr b/src/test/ui/pattern/issue-74539.stderr
@@ -31,7 +31,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         E::A(x @ .., _) => {
    |                    ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore the rest of the fields
    |
 LL |         E::A(x @ .., ..) => {
    |                    ^^^^
diff --git a/src/test/ui/pattern/pat-tuple-underfield.rs b/src/test/ui/pattern/pat-tuple-underfield.rs
@@ -8,38 +8,38 @@ fn main() {
         S(x) => {}
         //~^ ERROR this pattern has 1 field, but the corresponding tuple struct has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore the rest of the fields
     }
     match S(0, 1.0) {
         S(_) => {}
         //~^ ERROR this pattern has 1 field, but the corresponding tuple struct has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore all fields
     }
     match S(0, 1.0) {
         S() => {}
         //~^ ERROR this pattern has 0 fields, but the corresponding tuple struct has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore all fields
     }
 
     match E::S(0, 1.0) {
         E::S(x) => {}
         //~^ ERROR this pattern has 1 field, but the corresponding tuple variant has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore the rest of the fields
     }
     match E::S(0, 1.0) {
         E::S(_) => {}
         //~^ ERROR this pattern has 1 field, but the corresponding tuple variant has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore all fields
     }
     match E::S(0, 1.0) {
         E::S() => {}
         //~^ ERROR this pattern has 0 fields, but the corresponding tuple variant has 2 fields
         //~| HELP use `_` to explicitly ignore each field
-        //~| HELP use `..` to ignore all unmentioned fields
+        //~| HELP use `..` to ignore all fields
     }
     match E::S(0, 1.0) {
         E::S => {}
diff --git a/src/test/ui/pattern/pat-tuple-underfield.stderr b/src/test/ui/pattern/pat-tuple-underfield.stderr
@@ -20,7 +20,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         S(x, _) => {}
    |            ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore the rest of the fields
    |
 LL |         S(x, ..) => {}
    |            ^^^^
@@ -38,7 +38,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         S(_, _) => {}
    |            ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |         S(..) => {}
    |           ^^
@@ -56,7 +56,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         S(_, _) => {}
    |           ^^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |         S(..) => {}
    |           ^^
@@ -74,7 +74,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         E::S(x, _) => {}
    |               ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore the rest of the fields
    |
 LL |         E::S(x, ..) => {}
    |               ^^^^
@@ -92,7 +92,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         E::S(_, _) => {}
    |               ^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |         E::S(..) => {}
    |              ^^
@@ -110,7 +110,7 @@ help: use `_` to explicitly ignore each field
    |
 LL |         E::S(_, _) => {}
    |              ^^^^
-help: use `..` to ignore all unmentioned fields
+help: use `..` to ignore all fields
    |
 LL |         E::S(..) => {}
    |              ^^

Original file line number	Diff line number	Diff line change
@@ -36,7 +36,7 @@ help: use `_` to explicitly ignore each field
`36`	`36`	`\|`
`37`	`37`	`LL \| TupleStruct(_, _) = TupleStruct(1, 2);`
`38`	`38`	`\| ^^^`
`39`		-help: use `..` to ignore all unmentioned fields
	`39`	+help: use `..` to ignore all fields
`40`	`40`	`\|`
`41`	`41`	`LL \| TupleStruct(..) = TupleStruct(1, 2);`
`42`	`42`	`\| ^^`
@@ -63,7 +63,7 @@ help: use `_` to explicitly ignore each field
`63`	`63`	`\|`
`64`	`64`	`LL \| Enum::SingleVariant(_, _) = Enum::SingleVariant(1, 2);`
`65`	`65`	`\| ^^^`
`66`		-help: use `..` to ignore all unmentioned fields
	`66`	+help: use `..` to ignore all fields
`67`	`67`	`\|`
`68`	`68`	`LL \| Enum::SingleVariant(..) = Enum::SingleVariant(1, 2);`
`69`	`69`	`\| ^^`
Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ help: use `_` to explicitly ignore each field
`11`	`11`	`\|`
`12`	`12`	`LL \| Fruit::Apple(a, _) => {},`
`13`	`13`	`\| ^^^`
`14`		-help: use `..` to ignore all unmentioned fields
	`14`	+help: use `..` to ignore the rest of the fields
`15`	`15`	`\|`
`16`	`16`	`LL \| Fruit::Apple(a, ..) => {},`
`17`	`17`	`\| ^^^^`
Original file line number	Diff line number	Diff line change
@@ -22,7 +22,7 @@ help: use `_` to explicitly ignore each field
`22`	`22`	`\|`
`23`	`23`	`LL \| let P(_) = U {};`
`24`	`24`	`\| ^`
`25`		-help: use `..` to ignore all unmentioned fields
	`25`	+help: use `..` to ignore all fields
`26`	`26`	`\|`
`27`	`27`	`LL \| let P(..) = U {};`
`28`	`28`	`\| ^^`
Original file line number	Diff line number	Diff line change
@@ -31,7 +31,7 @@ help: use `_` to explicitly ignore each field
`31`	`31`	`\|`
`32`	`32`	`LL \| Binder(_a, _x @ .., _) => {}`
`33`	`33`	`\| ^^^`
`34`		-help: use `..` to ignore all unmentioned fields
	`34`	+help: use `..` to ignore the rest of the fields
`35`	`35`	`\|`
`36`	`36`	`LL \| Binder(_a, _x @ .., ..) => {}`
`37`	`37`	`\| ^^^^`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ help: use `_` to explicitly ignore each field
`20`	`20`	`\|`
`21`	`21`	`LL \| S(x, _) => {}`
`22`	`22`	`\| ^^^`
`23`		-help: use `..` to ignore all unmentioned fields
	`23`	+help: use `..` to ignore the rest of the fields
`24`	`24`	`\|`
`25`	`25`	`LL \| S(x, ..) => {}`
`26`	`26`	`\| ^^^^`
@@ -38,7 +38,7 @@ help: use `_` to explicitly ignore each field
`38`	`38`	`\|`
`39`	`39`	`LL \| S(_, _) => {}`
`40`	`40`	`\| ^^^`
`41`		-help: use `..` to ignore all unmentioned fields
	`41`	+help: use `..` to ignore all fields
`42`	`42`	`\|`
`43`	`43`	`LL \| S(..) => {}`
`44`	`44`	`\| ^^`
@@ -56,7 +56,7 @@ help: use `_` to explicitly ignore each field
`56`	`56`	`\|`
`57`	`57`	`LL \| S(_, _) => {}`
`58`	`58`	`\| ^^^^`
`59`		-help: use `..` to ignore all unmentioned fields
	`59`	+help: use `..` to ignore all fields
`60`	`60`	`\|`
`61`	`61`	`LL \| S(..) => {}`
`62`	`62`	`\| ^^`
@@ -74,7 +74,7 @@ help: use `_` to explicitly ignore each field
`74`	`74`	`\|`
`75`	`75`	`LL \| E::S(x, _) => {}`
`76`	`76`	`\| ^^^`
`77`		-help: use `..` to ignore all unmentioned fields
	`77`	+help: use `..` to ignore the rest of the fields
`78`	`78`	`\|`
`79`	`79`	`LL \| E::S(x, ..) => {}`
`80`	`80`	`\| ^^^^`
@@ -92,7 +92,7 @@ help: use `_` to explicitly ignore each field
`92`	`92`	`\|`
`93`	`93`	`LL \| E::S(_, _) => {}`
`94`	`94`	`\| ^^^`
`95`		-help: use `..` to ignore all unmentioned fields
	`95`	+help: use `..` to ignore all fields
`96`	`96`	`\|`
`97`	`97`	`LL \| E::S(..) => {}`
`98`	`98`	`\| ^^`
@@ -110,7 +110,7 @@ help: use `_` to explicitly ignore each field
`110`	`110`	`\|`
`111`	`111`	`LL \| E::S(_, _) => {}`
`112`	`112`	`\| ^^^^`
`113`		-help: use `..` to ignore all unmentioned fields
	`113`	+help: use `..` to ignore all fields
`114`	`114`	`\|`
`115`	`115`	`LL \| E::S(..) => {}`
`116`	`116`	`\| ^^`