about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2018-02-23 19:38:36 -0800
committerEsteban Küber <esteban@kuber.com.ar>2018-02-27 10:47:49 -0800
commitd63d363ef9d6627dc9649477b337a3f915d0660e (patch)
tree477268a91ade60ae4800706bdd567d00eb94644c /src/test/ui
parent36baa81be9f430329f5ea7b6bbb539e41105bfe2 (diff)
downloadrust-d63d363ef9d6627dc9649477b337a3f915d0660e.tar.gz
rust-d63d363ef9d6627dc9649477b337a3f915d0660e.zip
Diagnostic tweaks (review)
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/missing-block-hint.stderr4
-rw-r--r--src/test/ui/suggestions/missing-comma-in-match.rs1
-rw-r--r--src/test/ui/suggestions/missing-comma-in-match.stderr4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/test/ui/missing-block-hint.stderr b/src/test/ui/missing-block-hint.stderr
index ae583d0d4ba..a48eff890b3 100644
--- a/src/test/ui/missing-block-hint.stderr
+++ b/src/test/ui/missing-block-hint.stderr
@@ -2,7 +2,9 @@ error: expected `{`, found `=>`
   --> $DIR/missing-block-hint.rs:13:18
    |
 LL |         if (foo) => {} //~ ERROR expected `{`, found `=>`
-   |                  ^^ help: only necessary in match arms, not before if blocks
+   |         --       ^^
+   |         |
+   |         this `if` statement has a condition, but no block
 
 error: expected `{`, found `bar`
   --> $DIR/missing-block-hint.rs:17:13
diff --git a/src/test/ui/suggestions/missing-comma-in-match.rs b/src/test/ui/suggestions/missing-comma-in-match.rs
index e02a8df3343..6f86cdea3cf 100644
--- a/src/test/ui/suggestions/missing-comma-in-match.rs
+++ b/src/test/ui/suggestions/missing-comma-in-match.rs
@@ -14,7 +14,6 @@ fn main() {
         &Some(2) => { 3 }
         //~^ ERROR expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
         //~| NOTE expected one of `,`, `.`, `?`, `}`, or an operator here
-        //~^^^^ NOTE while parsing the match arm starting here
         _ => 2
     };
 }
diff --git a/src/test/ui/suggestions/missing-comma-in-match.stderr b/src/test/ui/suggestions/missing-comma-in-match.stderr
index 864fde49a5e..71123a160a5 100644
--- a/src/test/ui/suggestions/missing-comma-in-match.stderr
+++ b/src/test/ui/suggestions/missing-comma-in-match.stderr
@@ -2,9 +2,7 @@ error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
   --> $DIR/missing-comma-in-match.rs:14:18
    |
 13 |         &None => 1
-   |               --  - help: missing a comma here to end this match arm
-   |               |
-   |               while parsing the match arm starting here
+   |                   - help: missing a comma here to end this `match` arm
 14 |         &Some(2) => { 3 }
    |                  ^^ expected one of `,`, `.`, `?`, `}`, or an operator here