typeck/pat: address review comments

Centril · Centril · commit da10963357f9 · 2020-03-26T02:29:42.000+01:00
diff --git a/src/librustc_typeck/check/pat.rs b/src/librustc_typeck/check/pat.rs
@@ -1117,7 +1117,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         );
         err.span_suggestion_verbose(
             sp_comma,
-            "add `..` at the end of the field list",
+            "add `..` at the end of the field list to ignore all other fields",
             sugg.to_string(),
             Applicability::MachineApplicable,
         );
diff --git a/src/test/ui/rfc-2008-non-exhaustive/struct.stderr b/src/test/ui/rfc-2008-non-exhaustive/struct.stderr
@@ -63,7 +63,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
 LL |     let NormalStruct { first_field, second_field } = ns;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add `..` at the end of the field list
+help: add `..` at the end of the field list to ignore all other fields
    |
 LL |     let NormalStruct { first_field, second_field , .. } = ns;
    |                                                  ^^^^^^
@@ -74,7 +74,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
 LL |     let TupleStruct { 0: first_field, 1: second_field } = ts;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add `..` at the end of the field list
+help: add `..` at the end of the field list to ignore all other fields
    |
 LL |     let TupleStruct { 0: first_field, 1: second_field , .. } = ts;
    |                                                       ^^^^^^
@@ -85,7 +85,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
 LL |     let UnitStruct { } = us;
    |         ^^^^^^^^^^^^^^
    |
-help: add `..` at the end of the field list
+help: add `..` at the end of the field list to ignore all other fields
    |
 LL |     let UnitStruct { .. } = us;
    |                      ^^^^
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.stderr b/src/test/ui/rfc-2008-non-exhaustive/variant.stderr
@@ -70,7 +70,7 @@ error[E0638]: `..` required with variant marked as non-exhaustive
 LL |         NonExhaustiveVariants::Struct { field } => ""
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add `..` at the end of the field list
+help: add `..` at the end of the field list to ignore all other fields
    |
 LL |         NonExhaustiveVariants::Struct { field , .. } => ""
    |                                               ^^^^^^
@@ -81,7 +81,7 @@ error[E0638]: `..` required with variant marked as non-exhaustive
 LL |     if let NonExhaustiveVariants::Struct { field } = variant_struct {
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add `..` at the end of the field list
+help: add `..` at the end of the field list to ignore all other fields
    |
 LL |     if let NonExhaustiveVariants::Struct { field , .. } = variant_struct {
    |                                                  ^^^^^^

Original file line number	Diff line number	Diff line change
@@ -63,7 +63,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
`63`	`63`	`LL \| let NormalStruct { first_field, second_field } = ns;`
`64`	`64`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`65`	`65`	`\|`
`66`		-help: add `..` at the end of the field list
	`66`	+help: add `..` at the end of the field list to ignore all other fields
`67`	`67`	`\|`
`68`	`68`	`LL \| let NormalStruct { first_field, second_field , .. } = ns;`
`69`	`69`	`\| ^^^^^^`
@@ -74,7 +74,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
`74`	`74`	`LL \| let TupleStruct { 0: first_field, 1: second_field } = ts;`
`75`	`75`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`76`	`76`	`\|`
`77`		-help: add `..` at the end of the field list
	`77`	+help: add `..` at the end of the field list to ignore all other fields
`78`	`78`	`\|`
`79`	`79`	`LL \| let TupleStruct { 0: first_field, 1: second_field , .. } = ts;`
`80`	`80`	`\| ^^^^^^`
@@ -85,7 +85,7 @@ error[E0638]: `..` required with struct marked as non-exhaustive
`85`	`85`	`LL \| let UnitStruct { } = us;`
`86`	`86`	`\| ^^^^^^^^^^^^^^`
`87`	`87`	`\|`
`88`		-help: add `..` at the end of the field list
	`88`	+help: add `..` at the end of the field list to ignore all other fields
`89`	`89`	`\|`
`90`	`90`	`LL \| let UnitStruct { .. } = us;`
`91`	`91`	`\| ^^^^`
Original file line number	Diff line number	Diff line change
@@ -70,7 +70,7 @@ error[E0638]: `..` required with variant marked as non-exhaustive
`70`	`70`	`LL \| NonExhaustiveVariants::Struct { field } => ""`
`71`	`71`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`72`	`72`	`\|`
`73`		-help: add `..` at the end of the field list
	`73`	+help: add `..` at the end of the field list to ignore all other fields
`74`	`74`	`\|`
`75`	`75`	`LL \| NonExhaustiveVariants::Struct { field , .. } => ""`
`76`	`76`	`\| ^^^^^^`
@@ -81,7 +81,7 @@ error[E0638]: `..` required with variant marked as non-exhaustive
`81`	`81`	`LL \| if let NonExhaustiveVariants::Struct { field } = variant_struct {`
`82`	`82`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`83`	`83`	`\|`
`84`		-help: add `..` at the end of the field list
	`84`	+help: add `..` at the end of the field list to ignore all other fields
`85`	`85`	`\|`
`86`	`86`	`LL \| if let NonExhaustiveVariants::Struct { field , .. } = variant_struct {`
`87`	`87`	`\| ^^^^^^`