Various tweaks

8 files changed, 18 insertions, 23 deletions

diff --git a/src/test/compile-fail/bad-env-capture.rs b/src/test/compile-fail/bad-env-capture.rs
index 93866488732..6a5e4cfef89 100644
--- a/src/test/compile-fail/bad-env-capture.rs
+++ b/src/test/compile-fail/bad-env-capture.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
+// error-pattern: can't capture dynamic environment in a fn item
 fn foo() {
     let x: isize;
     fn bar() { log(debug, x); }
diff --git a/src/test/compile-fail/bad-env-capture2.rs b/src/test/compile-fail/bad-env-capture2.rs
index 39a6922cfd0..cf67c73c539 100644
--- a/src/test/compile-fail/bad-env-capture2.rs
+++ b/src/test/compile-fail/bad-env-capture2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
+// error-pattern: can't capture dynamic environment in a fn item
 fn foo(x: isize) {
     fn bar() { log(debug, x); }
 }
diff --git a/src/test/compile-fail/bad-env-capture3.rs b/src/test/compile-fail/bad-env-capture3.rs
index 8857b94ddce..a30c6770b87 100644
--- a/src/test/compile-fail/bad-env-capture3.rs
+++ b/src/test/compile-fail/bad-env-capture3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
+// error-pattern: can't capture dynamic environment in a fn item
 fn foo(x: isize) {
     fn mth() {
         fn bar() { log(debug, x); }
diff --git a/src/test/compile-fail/capture1.rs b/src/test/compile-fail/capture1.rs
index fd50918a313..984385f4cc0 100644
--- a/src/test/compile-fail/capture1.rs
+++ b/src/test/compile-fail/capture1.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-// error-pattern: can't capture dynamic environment in a fn item;
+// error-pattern: can't capture dynamic environment in a fn item
 
 fn main() {
     let bar: isize = 5;
diff --git a/src/test/ui/issue-30302.stderr b/src/test/ui/issue-30302.stderr
index 52bc2645eed..66e43d0859f 100644
--- a/src/test/ui/issue-30302.stderr
+++ b/src/test/ui/issue-30302.stderr
@@ -10,10 +10,10 @@ error: unreachable pattern
   --> $DIR/issue-30302.rs:25:9
    |
 23 |         Nil => true,
-   |         --- this pattern matches any value
+   |         --- matches any value
 24 | //~^ WARN pattern binding `Nil` is named the same as one of the variants of the type `Stack`
 25 |         _ => false
-   |         ^ this is an unreachable pattern
+   |         ^ unreachable pattern
    |
 note: lint level defined here
   --> $DIR/issue-30302.rs:14:9
diff --git a/src/test/ui/issue-31221.stderr b/src/test/ui/issue-31221.stderr
index 7a0dc7c0007..1db48346c6e 100644
--- a/src/test/ui/issue-31221.stderr
+++ b/src/test/ui/issue-31221.stderr
@@ -2,9 +2,9 @@ error: unreachable pattern
   --> $DIR/issue-31221.rs:28:9
    |
 27 |         Var3 => (),
-   |         ---- this pattern matches any value
+   |         ---- matches any value
 28 |         Var2 => (),
-   |         ^^^^ this is an unreachable pattern
+   |         ^^^^ unreachable pattern
    |
 note: lint level defined here
   --> $DIR/issue-31221.rs:14:9
@@ -16,19 +16,17 @@ error: unreachable pattern
   --> $DIR/issue-31221.rs:34:9
    |
 33 |         &Var3 => (),
-   |         ----- this pattern matches any value
+   |         ----- matches any value
 34 |         &Var2 => (),
-   |         ^^^^^ this is an unreachable pattern
-   |
+   |         ^^^^^ unreachable pattern
 
 error: unreachable pattern
   --> $DIR/issue-31221.rs:41:9
    |
 40 |         (c, d) => (),
-   |         ------ this pattern matches any value
+   |         ------ matches any value
 41 |         anything => ()
-   |         ^^^^^^^^ this is an unreachable pattern
-   |
+   |         ^^^^^^^^ unreachable pattern
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/use-mod.rs b/src/test/ui/use-mod.rs
index 2eb716959c1..37495cd1724 100644
--- a/src/test/ui/use-mod.rs
+++ b/src/test/ui/use-mod.rs
@@ -10,7 +10,7 @@
 
 use foo::bar::{
     self,
-//~^ ERROR `self` import can only appear once in the list
+//~^ ERROR `self` import can only appear once in an import list
     Bar,
     self
 //~^ ERROR the name `bar` is defined multiple times
diff --git a/src/test/ui/use-mod.stderr b/src/test/ui/use-mod.stderr
index abc7e2beb1a..bb64909e64a 100644
--- a/src/test/ui/use-mod.stderr
+++ b/src/test/ui/use-mod.stderr
@@ -1,20 +1,17 @@
-error[E0430]: `self` import can only appear once in the list
+error[E0430]: `self` import can only appear once in an import list
   --> $DIR/use-mod.rs:12:5
    |
 12 |     self,
-   |     ^^^^
-   |
-note: another `self` import appears here
-  --> $DIR/use-mod.rs:15:5
-   |
+   |     ^^^^ can only appear once in an import list
+...
 15 |     self
-   |     ^^^^
+   |     ---- another `self` import appears here
 
 error[E0431]: `self` import can only appear in an import list with a non-empty prefix
   --> $DIR/use-mod.rs:19:6
    |
 19 | use {self};
-   |      ^^^^
+   |      ^^^^ can only appear in an import list with a non-empty prefix
 
 error[E0252]: the name `bar` is defined multiple times
   --> $DIR/use-mod.rs:15:5