typeck/pat: address review comments

rust-lang · Mar 26, 2020 · da10963 · da10963
1 parent bd34826
commit da10963
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
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 {
    |                                                  ^^^^^^