diff options
9 files changed, 21 insertions, 21 deletions
diff --git a/compiler/rustc_typeck/src/check/pat.rs b/compiler/rustc_typeck/src/check/pat.rs index a7670624f30..43a69fe1874 100644 --- 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 index dd1fbbbd3bb..c270593cac7 100644 --- 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 index 965cf28c79f..aaaada518d3 100644 --- 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 index 38177d15158..9bdbf0bf9f4 100644 --- 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 index 8edc6ca8f0e..02497029960 100644 --- 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 index 1ee45ca1b1e..37839482b31 100644 --- 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 index 7a73d39dbc0..78249ed057f 100644 --- 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 index 246dd0b37b6..f306377e6e5 100644 --- 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 index b7a54026639..d1aaeaeafa4 100644 --- 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(..) => {} | ^^ |