about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-14 18:02:49 +0200
committerMazdak Farrokhzad <twingoow@gmail.com>2019-10-14 18:02:49 +0200
commit3a9f8deb1d568baeb2cac503cf8667e3170fb2f8 (patch)
tree5e112743443a5893629b89c0f8670d25fc59deb6
parent72ad8f716bc2591fba72d7107a9938952214f485 (diff)
downloadrust-3a9f8deb1d568baeb2cac503cf8667e3170fb2f8.tar.gz
rust-3a9f8deb1d568baeb2cac503cf8667e3170fb2f8.zip
recover_intersection_pat: adjust wording
-rw-r--r--src/libsyntax/parse/parser/pat.rs6
-rw-r--r--src/test/ui/parser/intersection-patterns.rs10
-rw-r--r--src/test/ui/parser/intersection-patterns.stderr10
3 files changed, 13 insertions, 13 deletions
diff --git a/src/libsyntax/parse/parser/pat.rs b/src/libsyntax/parse/parser/pat.rs
index 55c534e56ce..e288346a329 100644
--- a/src/libsyntax/parse/parser/pat.rs
+++ b/src/libsyntax/parse/parser/pat.rs
@@ -417,14 +417,14 @@ impl<'a> Parser<'a> {
             *sub = Some(lhs);
 
             self.struct_span_err(sp, "pattern on wrong side of `@`")
-                .span_label(lhs_span, "pattern on the left, should be to the right")
-                .span_label(rhs.span, "binding on the right, should be to the left")
+                .span_label(lhs_span, "pattern on the left, should be on the right")
+                .span_label(rhs.span, "binding on the right, should be on the left")
                 .span_suggestion(sp, "switch the order", pprust::pat_to_string(&rhs), applicability)
                 .emit();
         } else {
             // The special case above doesn't apply so we may have e.g. `A(x) @ B(y)`.
             rhs.kind = PatKind::Wild;
-            self.struct_span_err(sp, "left-hand side of `@` must be a binding pattern")
+            self.struct_span_err(sp, "left-hand side of `@` must be a binding")
                 .span_label(lhs.span, "interpreted as a pattern, not a binding")
                 .span_label(rhs.span, "also a pattern")
                 .note("bindings are `x`, `mut x`, `ref x`, and `ref mut x`")
diff --git a/src/test/ui/parser/intersection-patterns.rs b/src/test/ui/parser/intersection-patterns.rs
index 1dda21519e3..3b0dfd1ee99 100644
--- a/src/test/ui/parser/intersection-patterns.rs
+++ b/src/test/ui/parser/intersection-patterns.rs
@@ -12,8 +12,8 @@ fn main() {
     match s {
         Some(x) @ y => {}
         //~^ ERROR pattern on wrong side of `@`
-        //~| pattern on the left, should be to the right
-        //~| binding on the right, should be to the left
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
         //~| HELP switch the order
         //~| SUGGESTION y@Some(x)
         _ => {}
@@ -21,7 +21,7 @@ fn main() {
 
     match s {
         Some(x) @ Some(y) => {}
-        //~^ ERROR left-hand side of `@` must be a binding pattern
+        //~^ ERROR left-hand side of `@` must be a binding
         //~| interpreted as a pattern, not a binding
         //~| also a pattern
         //~| NOTE bindings are `x`, `mut x`, `ref x`, and `ref mut x`
@@ -31,8 +31,8 @@ fn main() {
     match 2 {
         1 ..= 5 @ e => {}
         //~^ ERROR pattern on wrong side of `@`
-        //~| pattern on the left, should be to the right
-        //~| binding on the right, should be to the left
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
         //~| HELP switch the order
         //~| SUGGESTION e@1 ..=5
         _ => {}
diff --git a/src/test/ui/parser/intersection-patterns.stderr b/src/test/ui/parser/intersection-patterns.stderr
index 03781f8fdee..39fc9b9475d 100644
--- a/src/test/ui/parser/intersection-patterns.stderr
+++ b/src/test/ui/parser/intersection-patterns.stderr
@@ -4,11 +4,11 @@ error: pattern on wrong side of `@`
 LL |         Some(x) @ y => {}
    |         -------^^^-
    |         |         |
-   |         |         binding on the right, should be to the left
-   |         pattern on the left, should be to the right
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
    |         help: switch the order: `y@Some(x)`
 
-error: left-hand side of `@` must be a binding pattern
+error: left-hand side of `@` must be a binding
   --> $DIR/intersection-patterns.rs:23:9
    |
 LL |         Some(x) @ Some(y) => {}
@@ -25,8 +25,8 @@ error: pattern on wrong side of `@`
 LL |         1 ..= 5 @ e => {}
    |         -------^^^-
    |         |         |
-   |         |         binding on the right, should be to the left
-   |         pattern on the left, should be to the right
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
    |         help: switch the order: `e@1 ..=5`
 
 error: aborting due to 3 previous errors