resolve: Avoid sentence breaks in diagnostics

89 files changed, 187 insertions, 187 deletions

diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index c1dc3041d7d..2681295cf9b 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -1253,7 +1253,7 @@ Erroneous code example:
 
 ```compile_fail,E0433
 let map = HashMap::new();
-// error: failed to resolve. Use of undeclared type or module `HashMap`
+// error: failed to resolve: use of undeclared type or module `HashMap`
 ```
 
 Please verify you didn't misspell the type/module's name or that you didn't
diff --git a/src/librustc_resolve/error_reporting.rs b/src/librustc_resolve/error_reporting.rs
index 5bfa5746815..509040ff267 100644
--- a/src/librustc_resolve/error_reporting.rs
+++ b/src/librustc_resolve/error_reporting.rs
@@ -52,7 +52,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
     /// ```
     ///    |
     /// LL | use foo::Bar;
-    ///    |     ^^^ Did you mean `self::foo`?
+    ///    |     ^^^ did you mean `self::foo`?
     /// ```
     fn make_missing_self_suggestion(
         &mut self,
@@ -76,7 +76,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
     /// ```
     ///    |
     /// LL | use foo::Bar;
-    ///    |     ^^^ Did you mean `crate::foo`?
+    ///    |     ^^^ did you mean `crate::foo`?
     /// ```
     fn make_missing_crate_suggestion(
         &mut self,
@@ -107,7 +107,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
     /// ```
     ///    |
     /// LL | use foo::Bar;
-    ///    |     ^^^ Did you mean `super::foo`?
+    ///    |     ^^^ did you mean `super::foo`?
     /// ```
     fn make_missing_super_suggestion(
         &mut self,
@@ -131,7 +131,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
     /// ```
     ///    |
     /// LL | use foobar::Baz;
-    ///    |     ^^^^^^ Did you mean `baz::foobar`?
+    ///    |     ^^^^^^ did you mean `baz::foobar`?
     /// ```
     ///
     /// Used when importing a submodule of an external crate but missing that crate's
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 24a89f7cd54..a33bd7aa732 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -386,7 +386,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver,
         }
         ResolutionError::FailedToResolve(msg) => {
             let mut err = struct_span_err!(resolver.session, span, E0433,
-                                           "failed to resolve. {}", msg);
+                                           "failed to resolve: {}", msg);
             err.span_label(span, msg);
             err
         }
@@ -3738,7 +3738,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
                             continue;
                         }
                     }
-                    let msg = "There are too many initial `super`s.".to_string();
+                    let msg = "there are too many initial `super`s.".to_string();
                     return PathResult::Failed(ident.span, msg, false);
                 }
                 if i == 0 {
@@ -3832,7 +3832,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
                         ));
                     } else {
                         return PathResult::Failed(ident.span,
-                                                  format!("Not a module `{}`", ident),
+                                                  format!("not a module `{}`", ident),
                                                   is_last);
                     }
                 }
@@ -3857,14 +3857,14 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
                             (c.path.segments.len(), c.path.to_string())
                         });
                         if let Some(candidate) = candidates.get(0) {
-                            format!("Did you mean `{}`?", candidate.path)
+                            format!("did you mean `{}`?", candidate.path)
                         } else {
-                            format!("Maybe a missing `extern crate {};`?", ident)
+                            format!("maybe a missing `extern crate {};`?", ident)
                         }
                     } else if i == 0 {
-                        format!("Use of undeclared type or module `{}`", ident)
+                        format!("use of undeclared type or module `{}`", ident)
                     } else {
-                        format!("Could not find `{}` in `{}`", ident, path[i - 1].ident)
+                        format!("could not find `{}` in `{}`", ident, path[i - 1].ident)
                     };
                     return PathResult::Failed(ident.span, msg, is_last);
                 }
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 4637e73ee0f..b7ec62fee85 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -857,7 +857,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
                 ) {
                     Some((
                         span,
-                        format!("Did you mean `{}`?", Segment::names_to_string(&suggested_path)),
+                        format!("did you mean `{}`?", Segment::names_to_string(&suggested_path)),
                         note,
                     ))
                 } else {
diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.stderr b/src/test/ui/absolute-paths-in-nested-use-groups.stderr
index e88d26718a0..2bbd7b0ad3a 100644
--- a/src/test/ui/absolute-paths-in-nested-use-groups.stderr
+++ b/src/test/ui/absolute-paths-in-nested-use-groups.stderr
@@ -1,16 +1,16 @@
-error[E0433]: failed to resolve. crate root in paths can only be used in start position
+error[E0433]: failed to resolve: crate root in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:16:5
    |
 LL |     ::bar,       //~ ERROR crate root in paths can only be used in start position
    |     ^ crate root in paths can only be used in start position
 
-error[E0433]: failed to resolve. `super` in paths can only be used in start position
+error[E0433]: failed to resolve: `super` in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:17:5
    |
 LL |     super::bar,  //~ ERROR `super` in paths can only be used in start position
    |     ^^^^^ `super` in paths can only be used in start position
 
-error[E0433]: failed to resolve. `self` in paths can only be used in start position
+error[E0433]: failed to resolve: `self` in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:18:5
    |
 LL |     self::bar,   //~ ERROR `self` in paths can only be used in start position
diff --git a/src/test/ui/bad/bad-module.rs b/src/test/ui/bad/bad-module.rs
index 6987d06ef12..4f38d4ce45e 100644
--- a/src/test/ui/bad/bad-module.rs
+++ b/src/test/ui/bad/bad-module.rs
@@ -10,8 +10,8 @@
 
 fn main() {
     let foo = thing::len(Vec::new());
-    //~^ ERROR failed to resolve. Use of undeclared type or module `thing`
+    //~^ ERROR failed to resolve: use of undeclared type or module `thing`
 
     let foo = foo::bar::baz();
-    //~^ ERROR failed to resolve. Use of undeclared type or module `foo`
+    //~^ ERROR failed to resolve: use of undeclared type or module `foo`
 }
diff --git a/src/test/ui/bad/bad-module.stderr b/src/test/ui/bad/bad-module.stderr
index 8c19922dcab..8bdcceaa191 100644
--- a/src/test/ui/bad/bad-module.stderr
+++ b/src/test/ui/bad/bad-module.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `thing`
+error[E0433]: failed to resolve: use of undeclared type or module `thing`
   --> $DIR/bad-module.rs:12:15
    |
 LL |     let foo = thing::len(Vec::new());
-   |               ^^^^^ Use of undeclared type or module `thing`
+   |               ^^^^^ use of undeclared type or module `thing`
 
-error[E0433]: failed to resolve. Use of undeclared type or module `foo`
+error[E0433]: failed to resolve: use of undeclared type or module `foo`
   --> $DIR/bad-module.rs:15:15
    |
 LL |     let foo = foo::bar::baz();
-   |               ^^^ Use of undeclared type or module `foo`
+   |               ^^^ use of undeclared type or module `foo`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/custom-attribute-multisegment.rs b/src/test/ui/custom-attribute-multisegment.rs
index a8d82a35946..354f7173872 100644
--- a/src/test/ui/custom-attribute-multisegment.rs
+++ b/src/test/ui/custom-attribute-multisegment.rs
@@ -14,5 +14,5 @@
 
 mod existent {}
 
-#[existent::nonexistent] //~ ERROR failed to resolve. Could not find `nonexistent` in `existent`
+#[existent::nonexistent] //~ ERROR failed to resolve: could not find `nonexistent` in `existent`
 fn main() {}
diff --git a/src/test/ui/custom-attribute-multisegment.stderr b/src/test/ui/custom-attribute-multisegment.stderr
index ff72d1c36d8..690ba4982ab 100644
--- a/src/test/ui/custom-attribute-multisegment.stderr
+++ b/src/test/ui/custom-attribute-multisegment.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Could not find `nonexistent` in `existent`
+error[E0433]: failed to resolve: could not find `nonexistent` in `existent`
   --> $DIR/custom-attribute-multisegment.rs:17:13
    |
-LL | #[existent::nonexistent] //~ ERROR failed to resolve. Could not find `nonexistent` in `existent`
-   |             ^^^^^^^^^^^ Could not find `nonexistent` in `existent`
+LL | #[existent::nonexistent] //~ ERROR failed to resolve: could not find `nonexistent` in `existent`
+   |             ^^^^^^^^^^^ could not find `nonexistent` in `existent`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr
index 7cdcac3891f..5c5422f091b 100644
--- a/src/test/ui/derived-errors/issue-31997-1.stderr
+++ b/src/test/ui/derived-errors/issue-31997-1.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `HashMap`
+error[E0433]: failed to resolve: use of undeclared type or module `HashMap`
   --> $DIR/issue-31997-1.rs:30:19
    |
 LL |     let mut map = HashMap::new();
-   |                   ^^^^^^^ Use of undeclared type or module `HashMap`
+   |                   ^^^^^^^ use of undeclared type or module `HashMap`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
index 0a0b1d573dd..fe9af74c01d 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
+++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
@@ -1,4 +1,4 @@
-error[E0433]: failed to resolve. `$crate` in paths can only be used in start position
+error[E0433]: failed to resolve: `$crate` in paths can only be used in start position
   --> $DIR/dollar-crate-is-keyword-2.rs:16:16
    |
 LL |         use a::$crate::b; //~ ERROR `$crate` in paths can only be used in start position
@@ -16,7 +16,7 @@ LL |         use a::$crate; //~ ERROR unresolved import `a::$crate`
 LL | m!();
    | ----- in this macro invocation
 
-error[E0433]: failed to resolve. `$crate` in paths can only be used in start position
+error[E0433]: failed to resolve: `$crate` in paths can only be used in start position
   --> $DIR/dollar-crate-is-keyword-2.rs:17:21
    |
 LL |         type A = a::$crate; //~ ERROR `$crate` in paths can only be used in start position
diff --git a/src/test/ui/dyn-trait-compatibility.rs b/src/test/ui/dyn-trait-compatibility.rs
index 454b6d2f566..4297e1b43d3 100644
--- a/src/test/ui/dyn-trait-compatibility.rs
+++ b/src/test/ui/dyn-trait-compatibility.rs
@@ -11,7 +11,7 @@
 type A0 = dyn;
 //~^ ERROR cannot find type `dyn` in this scope
 type A1 = dyn::dyn;
-//~^ ERROR Use of undeclared type or module `dyn`
+//~^ ERROR use of undeclared type or module `dyn`
 type A2 = dyn<dyn, dyn>;
 //~^ ERROR cannot find type `dyn` in this scope
 //~| ERROR cannot find type `dyn` in this scope
@@ -19,6 +19,6 @@ type A2 = dyn<dyn, dyn>;
 type A3 = dyn<<dyn as dyn>::dyn>;
 //~^ ERROR cannot find type `dyn` in this scope
 //~| ERROR cannot find type `dyn` in this scope
-//~| ERROR Use of undeclared type or module `dyn`
+//~| ERROR use of undeclared type or module `dyn`
 
 fn main() {}
diff --git a/src/test/ui/dyn-trait-compatibility.stderr b/src/test/ui/dyn-trait-compatibility.stderr
index 1ff3249371b..93048ccad6f 100644
--- a/src/test/ui/dyn-trait-compatibility.stderr
+++ b/src/test/ui/dyn-trait-compatibility.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `dyn`
+error[E0433]: failed to resolve: use of undeclared type or module `dyn`
   --> $DIR/dyn-trait-compatibility.rs:13:11
    |
 LL | type A1 = dyn::dyn;
-   |           ^^^ Use of undeclared type or module `dyn`
+   |           ^^^ use of undeclared type or module `dyn`
 
-error[E0433]: failed to resolve. Use of undeclared type or module `dyn`
+error[E0433]: failed to resolve: use of undeclared type or module `dyn`
   --> $DIR/dyn-trait-compatibility.rs:19:23
    |
 LL | type A3 = dyn<<dyn as dyn>::dyn>;
-   |                       ^^^ Use of undeclared type or module `dyn`
+   |                       ^^^ use of undeclared type or module `dyn`
 
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:11:11
diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr
index 291bb450755..d288cd086e7 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/src/test/ui/error-codes/E0432.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `something`
   --> $DIR/E0432.rs:11:5
    |
 LL | use something::Foo; //~ ERROR E0432
-   |     ^^^^^^^^^ Maybe a missing `extern crate something;`?
+   |     ^^^^^^^^^ maybe a missing `extern crate something;`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
index f8cf5f6f92f..8a66e749ba8 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/src/test/ui/error-codes/E0433.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `HashMap`
+error[E0433]: failed to resolve: use of undeclared type or module `HashMap`
   --> $DIR/E0433.rs:12:15
    |
 LL |     let map = HashMap::new(); //~ ERROR E0433
-   |               ^^^^^^^ Use of undeclared type or module `HashMap`
+   |               ^^^^^^^ use of undeclared type or module `HashMap`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/export-fully-qualified.rs b/src/test/ui/export-fully-qualified.rs
index 19fa13f8377..422cd251de4 100644
--- a/src/test/ui/export-fully-qualified.rs
+++ b/src/test/ui/export-fully-qualified.rs
@@ -13,7 +13,7 @@
 // want to change eventually.
 
 mod foo {
-    pub fn bar() { foo::baz(); } //~ ERROR failed to resolve. Use of undeclared type or module `foo`
+    pub fn bar() { foo::baz(); } //~ ERROR failed to resolve: use of undeclared type or module `foo`
 
     fn baz() { }
 }
diff --git a/src/test/ui/export-fully-qualified.stderr b/src/test/ui/export-fully-qualified.stderr
index b8409929763..477cb4b1dd1 100644
--- a/src/test/ui/export-fully-qualified.stderr
+++ b/src/test/ui/export-fully-qualified.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `foo`
+error[E0433]: failed to resolve: use of undeclared type or module `foo`
   --> $DIR/export-fully-qualified.rs:16:20
    |
-LL |     pub fn bar() { foo::baz(); } //~ ERROR failed to resolve. Use of undeclared type or module `foo`
-   |                    ^^^ Use of undeclared type or module `foo`
+LL |     pub fn bar() { foo::baz(); } //~ ERROR failed to resolve: use of undeclared type or module `foo`
+   |                    ^^^ use of undeclared type or module `foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/export2.rs b/src/test/ui/export2.rs
index dc96ce7f504..4cc9762d975 100644
--- a/src/test/ui/export2.rs
+++ b/src/test/ui/export2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 mod foo {
-    pub fn x() { bar::x(); } //~ ERROR failed to resolve. Use of undeclared type or module `bar`
+    pub fn x() { bar::x(); } //~ ERROR failed to resolve: use of undeclared type or module `bar`
 }
 
 mod bar {
diff --git a/src/test/ui/export2.stderr b/src/test/ui/export2.stderr
index c76afb8a1e2..7659183c8e0 100644
--- a/src/test/ui/export2.stderr
+++ b/src/test/ui/export2.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `bar`
+error[E0433]: failed to resolve: use of undeclared type or module `bar`
   --> $DIR/export2.rs:12:18
    |
-LL |     pub fn x() { bar::x(); } //~ ERROR failed to resolve. Use of undeclared type or module `bar`
-   |                  ^^^ Use of undeclared type or module `bar`
+LL |     pub fn x() { bar::x(); } //~ ERROR failed to resolve: use of undeclared type or module `bar`
+   |                  ^^^ use of undeclared type or module `bar`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/extern/extern-macro.rs b/src/test/ui/extern/extern-macro.rs
index fcba5cb4f07..88a72778a85 100644
--- a/src/test/ui/extern/extern-macro.rs
+++ b/src/test/ui/extern/extern-macro.rs
@@ -12,5 +12,5 @@
 
 fn main() {
     enum Foo {}
-    let _ = Foo::bar!(); //~ ERROR failed to resolve. partially resolved path in a macro
+    let _ = Foo::bar!(); //~ ERROR failed to resolve: partially resolved path in a macro
 }
diff --git a/src/test/ui/extern/extern-macro.stderr b/src/test/ui/extern/extern-macro.stderr
index 159fefdd269..6123d970166 100644
--- a/src/test/ui/extern/extern-macro.stderr
+++ b/src/test/ui/extern/extern-macro.stderr
@@ -1,7 +1,7 @@
-error[E0433]: failed to resolve. partially resolved path in a macro
+error[E0433]: failed to resolve: partially resolved path in a macro
   --> $DIR/extern-macro.rs:15:13
    |
-LL |     let _ = Foo::bar!(); //~ ERROR failed to resolve. partially resolved path in a macro
+LL |     let _ = Foo::bar!(); //~ ERROR failed to resolve: partially resolved path in a macro
    |             ^^^^^^^^ partially resolved path in a macro
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
index 7a996abc767..7c94200f00f 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
+++ b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr
@@ -2,13 +2,13 @@ error[E0432]: unresolved import `core`
   --> $DIR/feature-gate-extern_absolute_paths.rs:11:5
    |
 LL | use core::default; //~ ERROR unresolved import `core`
-   |     ^^^^ Maybe a missing `extern crate core;`?
+   |     ^^^^ maybe a missing `extern crate core;`?
 
-error[E0433]: failed to resolve. Maybe a missing `extern crate core;`?
+error[E0433]: failed to resolve: maybe a missing `extern crate core;`?
   --> $DIR/feature-gate-extern_absolute_paths.rs:14:19
    |
 LL |     let _: u8 = ::core::default::Default(); //~ ERROR failed to resolve
-   |                   ^^^^ Maybe a missing `extern crate core;`?
+   |                   ^^^^ maybe a missing `extern crate core;`?
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr
index 463fdbf00ce..73a63a2c7f5 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ b/src/test/ui/hygiene/no_implicit_prelude.stderr
@@ -1,11 +1,11 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `Vec`
+error[E0433]: failed to resolve: use of undeclared type or module `Vec`
   --> $DIR/no_implicit_prelude.rs:21:9
    |
 LL |     fn f() { ::bar::m!(); }
    |              ------------ in this macro invocation
 ...
 LL |         Vec::new(); //~ ERROR failed to resolve
-   |         ^^^ Use of undeclared type or module `Vec`
+   |         ^^^ use of undeclared type or module `Vec`
 
 error[E0599]: no method named `clone` found for type `()` in the current scope
   --> $DIR/no_implicit_prelude.rs:22:12
diff --git a/src/test/ui/import2.rs b/src/test/ui/import2.rs
index c4bd9ff1e2a..d3bbdf15cd0 100644
--- a/src/test/ui/import2.rs
+++ b/src/test/ui/import2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432]
-                   //~^ Could not find `zed` in `baz`
+                   //~^ could not find `zed` in `baz`
 
 mod baz {}
 mod zed {
diff --git a/src/test/ui/import2.stderr b/src/test/ui/import2.stderr
index c07506845c4..b1973937701 100644
--- a/src/test/ui/import2.stderr
+++ b/src/test/ui/import2.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `baz::zed`
   --> $DIR/import2.rs:11:10
    |
 LL | use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432]
-   |          ^^^ Could not find `zed` in `baz`
+   |          ^^^ could not find `zed` in `baz`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/import3.stderr b/src/test/ui/import3.stderr
index 5211b862b3d..a4c367fb073 100644
--- a/src/test/ui/import3.stderr
+++ b/src/test/ui/import3.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `main`
   --> $DIR/import3.rs:12:5
    |
 LL | use main::bar;
-   |     ^^^^ Maybe a missing `extern crate main;`?
+   |     ^^^^ maybe a missing `extern crate main;`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs b/src/test/ui/imports/extern-prelude-extern-crate-fail.rs
index 57b097c9df3..6b70efe0c44 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs
+++ b/src/test/ui/imports/extern-prelude-extern-crate-fail.rs
@@ -7,7 +7,7 @@ mod n {
 
 mod m {
     fn check() {
-        two_macros::m!(); //~ ERROR failed to resolve. Use of undeclared type or module `two_macros`
+        two_macros::m!(); //~ ERROR failed to resolve: use of undeclared type or module `two_macros`
     }
 }
 
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr b/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
index 8f68d2af34c..baeed02517d 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
+++ b/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
@@ -7,11 +7,11 @@ LL |         extern crate std as non_existent;
 LL | define_std_as_non_existent!();
    | ------------------------------ in this macro invocation
 
-error[E0433]: failed to resolve. Use of undeclared type or module `two_macros`
+error[E0433]: failed to resolve: use of undeclared type or module `two_macros`
   --> $DIR/extern-prelude-extern-crate-fail.rs:10:9
    |
-LL |         two_macros::m!(); //~ ERROR failed to resolve. Use of undeclared type or module `two_macros`
-   |         ^^^^^^^^^^ Use of undeclared type or module `two_macros`
+LL |         two_macros::m!(); //~ ERROR failed to resolve: use of undeclared type or module `two_macros`
+   |         ^^^^^^^^^^ use of undeclared type or module `two_macros`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/imports/issue-53269.stderr b/src/test/ui/imports/issue-53269.stderr
index 781595212f8..0ed26ea6fe6 100644
--- a/src/test/ui/imports/issue-53269.stderr
+++ b/src/test/ui/imports/issue-53269.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `nonexistent_module`
   --> $DIR/issue-53269.rs:16:9
    |
 LL |     use nonexistent_module::mac; //~ ERROR unresolved import `nonexistent_module`
-   |         ^^^^^^^^^^^^^^^^^^ Maybe a missing `extern crate nonexistent_module;`?
+   |         ^^^^^^^^^^^^^^^^^^ maybe a missing `extern crate nonexistent_module;`?
 
 error[E0659]: `mac` is ambiguous (`macro_rules` vs non-`macro_rules` from other module)
   --> $DIR/issue-53269.rs:18:5
diff --git a/src/test/ui/issues/issue-1697.rs b/src/test/ui/issues/issue-1697.rs
index f8a68264339..43f92d8c3de 100644
--- a/src/test/ui/issues/issue-1697.rs
+++ b/src/test/ui/issues/issue-1697.rs
@@ -11,6 +11,6 @@
 // Testing that we don't fail abnormally after hitting the errors
 
 use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432]
-                   //~^ Maybe a missing `extern crate unresolved;`?
+                   //~^ maybe a missing `extern crate unresolved;`?
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-1697.stderr b/src/test/ui/issues/issue-1697.stderr
index 28a7fbcaabe..b588c883264 100644
--- a/src/test/ui/issues/issue-1697.stderr
+++ b/src/test/ui/issues/issue-1697.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `unresolved`
   --> $DIR/issue-1697.rs:13:5
    |
 LL | use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432]
-   |     ^^^^^^^^^^ Maybe a missing `extern crate unresolved;`?
+   |     ^^^^^^^^^^ maybe a missing `extern crate unresolved;`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-30560.rs b/src/test/ui/issues/issue-30560.rs
index 0b1afd75ca9..f033666220d 100644
--- a/src/test/ui/issues/issue-30560.rs
+++ b/src/test/ui/issues/issue-30560.rs
@@ -11,10 +11,10 @@
 type Alias = ();
 use Alias::*;
 //~^ ERROR unresolved import `Alias` [E0432]
-//~| Not a module `Alias`
+//~| not a module `Alias`
 use std::io::Result::*;
 //~^ ERROR unresolved import `std::io::Result` [E0432]
-//~| Not a module `Result`
+//~| not a module `Result`
 
 trait T {}
 use T::*; //~ ERROR items in traits are not importable
diff --git a/src/test/ui/issues/issue-30560.stderr b/src/test/ui/issues/issue-30560.stderr
index cb38c0dabe0..880c565cf9f 100644
--- a/src/test/ui/issues/issue-30560.stderr
+++ b/src/test/ui/issues/issue-30560.stderr
@@ -8,13 +8,13 @@ error[E0432]: unresolved import `Alias`
   --> $DIR/issue-30560.rs:12:5
    |
 LL | use Alias::*;
-   |     ^^^^^ Not a module `Alias`
+   |     ^^^^^ not a module `Alias`
 
 error[E0432]: unresolved import `std::io::Result`
   --> $DIR/issue-30560.rs:15:14
    |
 LL | use std::io::Result::*;
-   |              ^^^^^^ Not a module `Result`
+   |              ^^^^^^ not a module `Result`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-33293.rs b/src/test/ui/issues/issue-33293.rs
index bed577b8b9d..801ba7afcd6 100644
--- a/src/test/ui/issues/issue-33293.rs
+++ b/src/test/ui/issues/issue-33293.rs
@@ -11,6 +11,6 @@
 fn main() {
     match 0 {
         aaa::bbb(_) => ()
-        //~^ ERROR failed to resolve. Use of undeclared type or module `aaa`
+        //~^ ERROR failed to resolve: use of undeclared type or module `aaa`
     };
 }
diff --git a/src/test/ui/issues/issue-33293.stderr b/src/test/ui/issues/issue-33293.stderr
index e94979b6da4..dc288fa71ce 100644
--- a/src/test/ui/issues/issue-33293.stderr
+++ b/src/test/ui/issues/issue-33293.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `aaa`
+error[E0433]: failed to resolve: use of undeclared type or module `aaa`
   --> $DIR/issue-33293.rs:13:9
    |
 LL |         aaa::bbb(_) => ()
-   |         ^^^ Use of undeclared type or module `aaa`
+   |         ^^^ use of undeclared type or module `aaa`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-33464.stderr b/src/test/ui/issues/issue-33464.stderr
index b70fff01c9e..f41a3973625 100644
--- a/src/test/ui/issues/issue-33464.stderr
+++ b/src/test/ui/issues/issue-33464.stderr
@@ -2,19 +2,19 @@ error[E0432]: unresolved import `abc`
   --> $DIR/issue-33464.rs:13:5
    |
 LL | use abc::one_el;
-   |     ^^^ Maybe a missing `extern crate abc;`?
+   |     ^^^ maybe a missing `extern crate abc;`?
 
 error[E0432]: unresolved import `abc`
   --> $DIR/issue-33464.rs:15:5
    |
 LL | use abc::{a, bbb, cccccc};
-   |     ^^^ Maybe a missing `extern crate abc;`?
+   |     ^^^ maybe a missing `extern crate abc;`?
 
 error[E0432]: unresolved import `a_very_long_name`
   --> $DIR/issue-33464.rs:17:5
    |
 LL | use a_very_long_name::{el, el2};
-   |     ^^^^^^^^^^^^^^^^ Maybe a missing `extern crate a_very_long_name;`?
+   |     ^^^^^^^^^^^^^^^^ maybe a missing `extern crate a_very_long_name;`?
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-36881.stderr b/src/test/ui/issues/issue-36881.stderr
index 39132fde762..27effe9e342 100644
--- a/src/test/ui/issues/issue-36881.stderr
+++ b/src/test/ui/issues/issue-36881.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `issue_36881_aux`
   --> $DIR/issue-36881.rs:16:9
    |
 LL |     use issue_36881_aux::Foo; //~ ERROR unresolved import
-   |         ^^^^^^^^^^^^^^^ Maybe a missing `extern crate issue_36881_aux;`?
+   |         ^^^^^^^^^^^^^^^ maybe a missing `extern crate issue_36881_aux;`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-37887.stderr b/src/test/ui/issues/issue-37887.stderr
index 8448466087d..48fb6c2e6fa 100644
--- a/src/test/ui/issues/issue-37887.stderr
+++ b/src/test/ui/issues/issue-37887.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `libc`
   --> $DIR/issue-37887.rs:13:9
    |
 LL |     use libc::*; //~ ERROR unresolved import
-   |         ^^^^ Maybe a missing `extern crate libc;`?
+   |         ^^^^ maybe a missing `extern crate libc;`?
 
 error[E0658]: use of unstable library feature 'libc': use `libc` from crates.io (see issue #27783)
   --> $DIR/issue-37887.rs:12:5
diff --git a/src/test/ui/issues/issue-38857.rs b/src/test/ui/issues/issue-38857.rs
index b38b1b9fdc6..5217ddb9acb 100644
--- a/src/test/ui/issues/issue-38857.rs
+++ b/src/test/ui/issues/issue-38857.rs
@@ -10,6 +10,6 @@
 
 fn main() {
     let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() };
-    //~^ ERROR failed to resolve. Could not find `imp` in `sys` [E0433]
+    //~^ ERROR failed to resolve: could not find `imp` in `sys` [E0433]
     //~^^ ERROR module `sys` is private [E0603]
 }
diff --git a/src/test/ui/issues/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr
index f6ed3202671..65026344feb 100644
--- a/src/test/ui/issues/issue-38857.stderr
+++ b/src/test/ui/issues/issue-38857.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Could not find `imp` in `sys`
+error[E0433]: failed to resolve: could not find `imp` in `sys`
   --> $DIR/issue-38857.rs:12:23
    |
 LL |     let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() };
-   |                       ^^^ Could not find `imp` in `sys`
+   |                       ^^^ could not find `imp` in `sys`
 
 error[E0603]: module `sys` is private
   --> $DIR/issue-38857.rs:12:18
diff --git a/src/test/ui/keyword/keyword-super-as-identifier.rs b/src/test/ui/keyword/keyword-super-as-identifier.rs
index 54dac771f01..d8941f3e532 100644
--- a/src/test/ui/keyword/keyword-super-as-identifier.rs
+++ b/src/test/ui/keyword/keyword-super-as-identifier.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    let super = 22; //~ ERROR failed to resolve. There are too many initial `super`s
+    let super = 22; //~ ERROR failed to resolve: there are too many initial `super`s
 }
diff --git a/src/test/ui/keyword/keyword-super-as-identifier.stderr b/src/test/ui/keyword/keyword-super-as-identifier.stderr
index 649be45c224..9b665748794 100644
--- a/src/test/ui/keyword/keyword-super-as-identifier.stderr
+++ b/src/test/ui/keyword/keyword-super-as-identifier.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. There are too many initial `super`s.
+error[E0433]: failed to resolve: there are too many initial `super`s.
   --> $DIR/keyword-super-as-identifier.rs:12:9
    |
-LL |     let super = 22; //~ ERROR failed to resolve. There are too many initial `super`s
-   |         ^^^^^ There are too many initial `super`s.
+LL |     let super = 22; //~ ERROR failed to resolve: there are too many initial `super`s
+   |         ^^^^^ there are too many initial `super`s.
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/keyword/keyword-super.rs b/src/test/ui/keyword/keyword-super.rs
index 02047bd639f..87640630818 100644
--- a/src/test/ui/keyword/keyword-super.rs
+++ b/src/test/ui/keyword/keyword-super.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    let super: isize; //~ ERROR failed to resolve. There are too many initial `super`s
+    let super: isize; //~ ERROR failed to resolve: there are too many initial `super`s
 }
diff --git a/src/test/ui/keyword/keyword-super.stderr b/src/test/ui/keyword/keyword-super.stderr
index ac692ad45d2..690b684c133 100644
--- a/src/test/ui/keyword/keyword-super.stderr
+++ b/src/test/ui/keyword/keyword-super.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. There are too many initial `super`s.
+error[E0433]: failed to resolve: there are too many initial `super`s.
   --> $DIR/keyword-super.rs:12:9
    |
-LL |     let super: isize; //~ ERROR failed to resolve. There are too many initial `super`s
-   |         ^^^^^ There are too many initial `super`s.
+LL |     let super: isize; //~ ERROR failed to resolve: there are too many initial `super`s
+   |         ^^^^^ there are too many initial `super`s.
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/macro-inner-attributes.rs b/src/test/ui/macros/macro-inner-attributes.rs
index 1111b21d455..2a58fd55453 100644
--- a/src/test/ui/macros/macro-inner-attributes.rs
+++ b/src/test/ui/macros/macro-inner-attributes.rs
@@ -25,6 +25,6 @@ test!(b,
 #[qux]
 fn main() {
     a::bar();
-    //~^ ERROR failed to resolve. Use of undeclared type or module `a`
+    //~^ ERROR failed to resolve: use of undeclared type or module `a`
     b::bar();
 }
diff --git a/src/test/ui/macros/macro-inner-attributes.stderr b/src/test/ui/macros/macro-inner-attributes.stderr
index 11922bc448b..47d9469779b 100644
--- a/src/test/ui/macros/macro-inner-attributes.stderr
+++ b/src/test/ui/macros/macro-inner-attributes.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `a`
+error[E0433]: failed to resolve: use of undeclared type or module `a`
   --> $DIR/macro-inner-attributes.rs:27:5
    |
 LL |     a::bar();
-   |     ^ Use of undeclared type or module `a`
+   |     ^ use of undeclared type or module `a`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.rs b/src/test/ui/macros/macro-path-prelude-fail-1.rs
index e1181eb741b..bdf3ac0f69f 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.rs
+++ b/src/test/ui/macros/macro-path-prelude-fail-1.rs
@@ -12,8 +12,8 @@
 
 mod m {
     fn check() {
-        Vec::clone!(); //~ ERROR failed to resolve. Not a module `Vec`
-        u8::clone!(); //~ ERROR failed to resolve. Not a module `u8`
+        Vec::clone!(); //~ ERROR failed to resolve: not a module `Vec`
+        u8::clone!(); //~ ERROR failed to resolve: not a module `u8`
     }
 }
 
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.stderr b/src/test/ui/macros/macro-path-prelude-fail-1.stderr
index fc74937d912..590e4f0fd06 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.stderr
+++ b/src/test/ui/macros/macro-path-prelude-fail-1.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Not a module `Vec`
+error[E0433]: failed to resolve: not a module `Vec`
   --> $DIR/macro-path-prelude-fail-1.rs:15:9
    |
-LL |         Vec::clone!(); //~ ERROR failed to resolve. Not a module `Vec`
-   |         ^^^ Not a module `Vec`
+LL |         Vec::clone!(); //~ ERROR failed to resolve: not a module `Vec`
+   |         ^^^ not a module `Vec`
 
-error[E0433]: failed to resolve. Not a module `u8`
+error[E0433]: failed to resolve: not a module `u8`
   --> $DIR/macro-path-prelude-fail-1.rs:16:9
    |
-LL |         u8::clone!(); //~ ERROR failed to resolve. Not a module `u8`
-   |         ^^ Not a module `u8`
+LL |         u8::clone!(); //~ ERROR failed to resolve: not a module `u8`
+   |         ^^ not a module `u8`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.rs b/src/test/ui/macros/macro-path-prelude-fail-2.rs
index d9f99aa0119..e27c061e195 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.rs
+++ b/src/test/ui/macros/macro-path-prelude-fail-2.rs
@@ -10,7 +10,7 @@
 
 mod m {
     fn check() {
-        Result::Ok!(); //~ ERROR failed to resolve. partially resolved path in a macro
+        Result::Ok!(); //~ ERROR failed to resolve: partially resolved path in a macro
     }
 }
 
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.stderr b/src/test/ui/macros/macro-path-prelude-fail-2.stderr
index 31e45b320ad..cf123f43fea 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.stderr
+++ b/src/test/ui/macros/macro-path-prelude-fail-2.stderr
@@ -1,7 +1,7 @@
-error[E0433]: failed to resolve. partially resolved path in a macro
+error[E0433]: failed to resolve: partially resolved path in a macro
   --> $DIR/macro-path-prelude-fail-2.rs:13:9
    |
-LL |         Result::Ok!(); //~ ERROR failed to resolve. partially resolved path in a macro
+LL |         Result::Ok!(); //~ ERROR failed to resolve: partially resolved path in a macro
    |         ^^^^^^^^^^ partially resolved path in a macro
 
 error: aborting due to previous error
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.stderr b/src/test/ui/macros/macro_path_as_generic_bound.stderr
index 0f9f0607c5b..8b4fe9f200d 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.stderr
+++ b/src/test/ui/macros/macro_path_as_generic_bound.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `m`
+error[E0433]: failed to resolve: use of undeclared type or module `m`
   --> $DIR/macro_path_as_generic_bound.rs:17:6
    |
 LL | foo!(m::m2::A); //~ ERROR failed to resolve
-   |      ^ Use of undeclared type or module `m`
+   |      ^ use of undeclared type or module `m`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs
index e63b84594aa..c544ca4e304 100644
--- a/src/test/ui/pattern/pattern-error-continue.rs
+++ b/src/test/ui/pattern/pattern-error-continue.rs
@@ -42,6 +42,6 @@ fn main() {
     //~| expected char, found bool
 
     match () {
-        E::V => {} //~ ERROR failed to resolve. Use of undeclared type or module `E`
+        E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E`
     }
 }
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr
index b24366c48bc..f2c35ef872d 100644
--- a/src/test/ui/pattern/pattern-error-continue.stderr
+++ b/src/test/ui/pattern/pattern-error-continue.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `E`
+error[E0433]: failed to resolve: use of undeclared type or module `E`
   --> $DIR/pattern-error-continue.rs:45:9
    |
-LL |         E::V => {} //~ ERROR failed to resolve. Use of undeclared type or module `E`
-   |         ^ Use of undeclared type or module `E`
+LL |         E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E`
+   |         ^ use of undeclared type or module `E`
 
 error[E0532]: expected tuple struct/variant, found unit variant `A::D`
   --> $DIR/pattern-error-continue.rs:28:9
diff --git a/src/test/ui/privacy/restricted/test.rs b/src/test/ui/privacy/restricted/test.rs
index 8c1d609e244..2b2d9b76bdd 100644
--- a/src/test/ui/privacy/restricted/test.rs
+++ b/src/test/ui/privacy/restricted/test.rs
@@ -57,6 +57,6 @@ fn main() {
 }
 
 mod pathological {
-    pub(in bad::path) mod m1 {} //~ ERROR failed to resolve. Maybe a missing `extern crate bad;`?
+    pub(in bad::path) mod m1 {} //~ ERROR failed to resolve: maybe a missing `extern crate bad;`?
     pub(in foo) mod m2 {} //~ ERROR visibilities can only be restricted to ancestor modules
 }
diff --git a/src/test/ui/privacy/restricted/test.stderr b/src/test/ui/privacy/restricted/test.stderr
index afc3ee2db4b..01e224910a5 100644
--- a/src/test/ui/privacy/restricted/test.stderr
+++ b/src/test/ui/privacy/restricted/test.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Maybe a missing `extern crate bad;`?
+error[E0433]: failed to resolve: maybe a missing `extern crate bad;`?
   --> $DIR/test.rs:60:12
    |
-LL |     pub(in bad::path) mod m1 {} //~ ERROR failed to resolve. Maybe a missing `extern crate bad;`?
-   |            ^^^ Maybe a missing `extern crate bad;`?
+LL |     pub(in bad::path) mod m1 {} //~ ERROR failed to resolve: maybe a missing `extern crate bad;`?
+   |            ^^^ maybe a missing `extern crate bad;`?
 
 error: visibilities can only be restricted to ancestor modules
   --> $DIR/test.rs:61:12
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.rs b/src/test/ui/resolve/resolve-variant-assoc-item.rs
index 869eed5a8d7..01f493e954b 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.rs
+++ b/src/test/ui/resolve/resolve-variant-assoc-item.rs
@@ -12,6 +12,6 @@ enum E { V }
 use E::V;
 
 fn main() {
-    E::V::associated_item; //~ ERROR failed to resolve. Not a module `V`
-    V::associated_item; //~ ERROR failed to resolve. Not a module `V`
+    E::V::associated_item; //~ ERROR failed to resolve: not a module `V`
+    V::associated_item; //~ ERROR failed to resolve: not a module `V`
 }
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.stderr b/src/test/ui/resolve/resolve-variant-assoc-item.stderr
index a80a7c39249..ef2d0a71b5b 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.stderr
+++ b/src/test/ui/resolve/resolve-variant-assoc-item.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Not a module `V`
+error[E0433]: failed to resolve: not a module `V`
   --> $DIR/resolve-variant-assoc-item.rs:15:8
    |
-LL |     E::V::associated_item; //~ ERROR failed to resolve. Not a module `V`
-   |        ^ Not a module `V`
+LL |     E::V::associated_item; //~ ERROR failed to resolve: not a module `V`
+   |        ^ not a module `V`
 
-error[E0433]: failed to resolve. Not a module `V`
+error[E0433]: failed to resolve: not a module `V`
   --> $DIR/resolve-variant-assoc-item.rs:16:5
    |
-LL |     V::associated_item; //~ ERROR failed to resolve. Not a module `V`
-   |     ^ Not a module `V`
+LL |     V::associated_item; //~ ERROR failed to resolve: not a module `V`
+   |     ^ not a module `V`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/resolve_self_super_hint.rs b/src/test/ui/resolve_self_super_hint.rs
index a24f92fdc6d..2ce2d765832 100644
--- a/src/test/ui/resolve_self_super_hint.rs
+++ b/src/test/ui/resolve_self_super_hint.rs
@@ -15,19 +15,19 @@ mod a {
     extern crate alloc;
     use alloc::HashMap;
     //~^ ERROR unresolved import `alloc` [E0432]
-    //~| Did you mean `self::alloc`?
+    //~| did you mean `self::alloc`?
     mod b {
         use alloc::HashMap;
         //~^ ERROR unresolved import `alloc` [E0432]
-        //~| Did you mean `super::alloc`?
+        //~| did you mean `super::alloc`?
         mod c {
             use alloc::HashMap;
             //~^ ERROR unresolved import `alloc` [E0432]
-            //~| Did you mean `a::alloc`?
+            //~| did you mean `a::alloc`?
             mod d {
                 use alloc::HashMap;
                 //~^ ERROR unresolved import `alloc` [E0432]
-                //~| Did you mean `a::alloc`?
+                //~| did you mean `a::alloc`?
             }
         }
     }
diff --git a/src/test/ui/resolve_self_super_hint.stderr b/src/test/ui/resolve_self_super_hint.stderr
index 924788bdaab..613107712b2 100644
--- a/src/test/ui/resolve_self_super_hint.stderr
+++ b/src/test/ui/resolve_self_super_hint.stderr
@@ -2,25 +2,25 @@ error[E0432]: unresolved import `alloc`
   --> $DIR/resolve_self_super_hint.rs:16:9
    |
 LL |     use alloc::HashMap;
-   |         ^^^^^ Did you mean `self::alloc`?
+   |         ^^^^^ did you mean `self::alloc`?
 
 error[E0432]: unresolved import `alloc`
   --> $DIR/resolve_self_super_hint.rs:20:13
    |
 LL |         use alloc::HashMap;
-   |             ^^^^^ Did you mean `super::alloc`?
+   |             ^^^^^ did you mean `super::alloc`?
 
 error[E0432]: unresolved import `alloc`
   --> $DIR/resolve_self_super_hint.rs:24:17
    |
 LL |             use alloc::HashMap;
-   |                 ^^^^^ Did you mean `a::alloc`?
+   |                 ^^^^^ did you mean `a::alloc`?
 
 error[E0432]: unresolved import `alloc`
   --> $DIR/resolve_self_super_hint.rs:28:21
    |
 LL |                 use alloc::HashMap;
-   |                     ^^^^^ Did you mean `a::alloc`?
+   |                     ^^^^^ did you mean `a::alloc`?
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
index f16c8496077..2751d8cb285 100644
--- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
+++ b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
@@ -1,10 +1,10 @@
-error[E0433]: failed to resolve. `crate` in paths can only be used in start position
+error[E0433]: failed to resolve: `crate` in paths can only be used in start position
   --> $DIR/crate-path-non-absolute.rs:17:22
    |
 LL |         let s = ::m::crate::S; //~ ERROR failed to resolve
    |                      ^^^^^ `crate` in paths can only be used in start position
 
-error[E0433]: failed to resolve. global paths cannot start with `crate`
+error[E0433]: failed to resolve: global paths cannot start with `crate`
   --> $DIR/crate-path-non-absolute.rs:18:20
    |
 LL |         let s1 = ::crate::S; //~ ERROR failed to resolve
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
index ba44f20facf..39b2db7a19f 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
+++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `xcrate`
   --> $DIR/non-existent-1.rs:13:5
    |
 LL | use xcrate::S; //~ ERROR unresolved import `xcrate`
-   |     ^^^^^^ Use of undeclared type or module `xcrate`
+   |     ^^^^^^ use of undeclared type or module `xcrate`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
index 41adb974f21..a07c3f17d6f 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
+++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
@@ -12,5 +12,5 @@
 
 fn main() {
     let s = ::xcrate::S;
-    //~^ ERROR failed to resolve. Could not find `xcrate` in `{{root}}`
+    //~^ ERROR failed to resolve: could not find `xcrate` in `{{root}}`
 }
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
index b46576b0143..30e5b0ad1df 100644
--- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
+++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Could not find `xcrate` in `{{root}}`
+error[E0433]: failed to resolve: could not find `xcrate` in `{{root}}`
   --> $DIR/non-existent-2.rs:14:15
    |
 LL |     let s = ::xcrate::S;
-   |               ^^^^^^ Could not find `xcrate` in `{{root}}`
+   |               ^^^^^^ could not find `xcrate` in `{{root}}`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr
index 55b8b625507..47ea4b8dfcb 100644
--- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr
+++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `extern::xcrate`
   --> $DIR/non-existent-1.rs:13:13
    |
 LL | use extern::xcrate::S; //~ ERROR unresolved import `extern::xcrate`
-   |             ^^^^^^ Could not find `xcrate` in `extern`
+   |             ^^^^^^ could not find `xcrate` in `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs
index 128ecf41a30..8d7c3993c62 100644
--- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs
+++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs
@@ -12,5 +12,5 @@
 
 fn main() {
     let s = extern::xcrate::S;
-    //~^ ERROR failed to resolve. Could not find `xcrate` in `extern`
+    //~^ ERROR failed to resolve: could not find `xcrate` in `extern`
 }
diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr
index 7fbe50a9202..89630adb5a8 100644
--- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr
+++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Could not find `xcrate` in `extern`
+error[E0433]: failed to resolve: could not find `xcrate` in `extern`
   --> $DIR/non-existent-2.rs:14:21
    |
 LL |     let s = extern::xcrate::S;
-   |                     ^^^^^^ Could not find `xcrate` in `extern`
+   |                     ^^^^^^ could not find `xcrate` in `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/issue-54006.stderr b/src/test/ui/rust-2018/issue-54006.stderr
index 268a16e5d2a..5f92574c23f 100644
--- a/src/test/ui/rust-2018/issue-54006.stderr
+++ b/src/test/ui/rust-2018/issue-54006.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `alloc`
   --> $DIR/issue-54006.rs:16:5
    |
 LL | use alloc::vec;
-   |     ^^^^^ Did you mean `core::alloc`?
+   |     ^^^^^ did you mean `core::alloc`?
 
 error: cannot determine resolution for the macro `vec`
   --> $DIR/issue-54006.rs:20:18
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr b/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
index d7580507ce4..741b2ca0826 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
+++ b/src/test/ui/rust-2018/local-path-suggestions-2015.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `foobar`
   --> $DIR/local-path-suggestions-2015.rs:34:5
    |
 LL | use foobar::Baz;
-   |     ^^^^^^ Did you mean `aux_baz::foobar`?
+   |     ^^^^^^ did you mean `aux_baz::foobar`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr b/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
index 41d7e186c36..27ea6642eb0 100644
--- a/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
+++ b/src/test/ui/rust-2018/local-path-suggestions-2018.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `foo`
   --> $DIR/local-path-suggestions-2018.rs:22:9
    |
 LL |     use foo::Bar;
-   |         ^^^ Did you mean `crate::foo`?
+   |         ^^^ did you mean `crate::foo`?
    |
    = note: `use` statements changed in Rust 2018; read more at <https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html>
 
@@ -10,7 +10,7 @@ error[E0432]: unresolved import `foobar`
   --> $DIR/local-path-suggestions-2018.rs:31:5
    |
 LL | use foobar::Baz;
-   |     ^^^^^^ Did you mean `baz::foobar`?
+   |     ^^^^^^ did you mean `baz::foobar`?
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr b/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr
index a02775eabf4..794d986b82e 100644
--- a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr
+++ b/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr
@@ -8,7 +8,7 @@ error[E0432]: unresolved import `rustfmt`
   --> $DIR/prelude-fail.rs:9:5
    |
 LL | use rustfmt::skip as imported_rustfmt_skip; //~ ERROR unresolved import `rustfmt`
-   |     ^^^^^^^ Not a module `rustfmt`
+   |     ^^^^^^^ not a module `rustfmt`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/span/non-existing-module-import.stderr b/src/test/ui/span/non-existing-module-import.stderr
index 5518b42ac65..1f001530f36 100644
--- a/src/test/ui/span/non-existing-module-import.stderr
+++ b/src/test/ui/span/non-existing-module-import.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `std::bar`
   --> $DIR/non-existing-module-import.rs:11:10
    |
 LL | use std::bar::{foo1, foo2}; //~ ERROR unresolved import
-   |          ^^^ Could not find `bar` in `std`
+   |          ^^^ could not find `bar` in `std`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/super-at-top-level.rs b/src/test/ui/super-at-top-level.rs
index c607711c44f..96d099c7655 100644
--- a/src/test/ui/super-at-top-level.rs
+++ b/src/test/ui/super-at-top-level.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use super::f; //~ ERROR There are too many initial `super`s
+use super::f; //~ ERROR there are too many initial `super`s
 
 fn main() {
 }
diff --git a/src/test/ui/super-at-top-level.stderr b/src/test/ui/super-at-top-level.stderr
index b4af73055a0..8402daad19e 100644
--- a/src/test/ui/super-at-top-level.stderr
+++ b/src/test/ui/super-at-top-level.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. There are too many initial `super`s.
+error[E0433]: failed to resolve: there are too many initial `super`s.
   --> $DIR/super-at-top-level.rs:11:5
    |
-LL | use super::f; //~ ERROR There are too many initial `super`s
-   |     ^^^^^ There are too many initial `super`s.
+LL | use super::f; //~ ERROR there are too many initial `super`s
+   |     ^^^^^ there are too many initial `super`s.
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs b/src/test/ui/tool-attributes/tool-attributes-shadowing.rs
index b6a24ccf748..11e28857afe 100644
--- a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs
+++ b/src/test/ui/tool-attributes/tool-attributes-shadowing.rs
@@ -10,5 +10,5 @@
 
 mod rustfmt {}
 
-#[rustfmt::skip] //~ ERROR failed to resolve. Could not find `skip` in `rustfmt`
+#[rustfmt::skip] //~ ERROR failed to resolve: could not find `skip` in `rustfmt`
 fn main() {}
diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr b/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr
index d593350f123..0839e363c36 100644
--- a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr
+++ b/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Could not find `skip` in `rustfmt`
+error[E0433]: failed to resolve: could not find `skip` in `rustfmt`
   --> $DIR/tool-attributes-shadowing.rs:13:12
    |
-LL | #[rustfmt::skip] //~ ERROR failed to resolve. Could not find `skip` in `rustfmt`
-   |            ^^^^ Could not find `skip` in `rustfmt`
+LL | #[rustfmt::skip] //~ ERROR failed to resolve: could not find `skip` in `rustfmt`
+   |            ^^^^ could not find `skip` in `rustfmt`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type/type-path-err-node-types.stderr b/src/test/ui/type/type-path-err-node-types.stderr
index c28b30b5456..df7d442239b 100644
--- a/src/test/ui/type/type-path-err-node-types.stderr
+++ b/src/test/ui/type/type-path-err-node-types.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `NonExistent`
+error[E0433]: failed to resolve: use of undeclared type or module `NonExistent`
   --> $DIR/type-path-err-node-types.rs:25:5
    |
 LL |     NonExistent::Assoc::<u8>; //~ ERROR undeclared type or module `NonExistent`
-   |     ^^^^^^^^^^^ Use of undeclared type or module `NonExistent`
+   |     ^^^^^^^^^^^ use of undeclared type or module `NonExistent`
 
 error[E0412]: cannot find type `Nonexistent` in this scope
   --> $DIR/type-path-err-node-types.rs:17:12
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.rs b/src/test/ui/ufcs/ufcs-partially-resolved.rs
index f7120ddb114..db10197ded1 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.rs
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.rs
@@ -55,9 +55,9 @@ fn main() {
     <u8 as E::N>::NN; //~ ERROR cannot find method or associated constant `NN` in `E::N`
     <u8 as A::N>::NN; //~ ERROR cannot find method or associated constant `NN` in `A::N`
     let _: <u8 as Tr::Y>::NN; //~ ERROR cannot find associated type `NN` in `Tr::Y`
-    let _: <u8 as E::Y>::NN; //~ ERROR failed to resolve. Not a module `Y`
+    let _: <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
     <u8 as Tr::Y>::NN; //~ ERROR cannot find method or associated constant `NN` in `Tr::Y`
-    <u8 as E::Y>::NN; //~ ERROR failed to resolve. Not a module `Y`
+    <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
 
     let _: <u8 as Dr>::Z; //~ ERROR expected associated type, found method `Dr::Z`
     <u8 as Dr>::X; //~ ERROR expected method or associated constant, found associated type `Dr::X`
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
index 77d887f1d68..cb571be661d 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Not a module `Y`
+error[E0433]: failed to resolve: not a module `Y`
   --> $DIR/ufcs-partially-resolved.rs:58:22
    |
-LL |     let _: <u8 as E::Y>::NN; //~ ERROR failed to resolve. Not a module `Y`
-   |                      ^ Not a module `Y`
+LL |     let _: <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
+   |                      ^ not a module `Y`
 
-error[E0433]: failed to resolve. Not a module `Y`
+error[E0433]: failed to resolve: not a module `Y`
   --> $DIR/ufcs-partially-resolved.rs:60:15
    |
-LL |     <u8 as E::Y>::NN; //~ ERROR failed to resolve. Not a module `Y`
-   |               ^ Not a module `Y`
+LL |     <u8 as E::Y>::NN; //~ ERROR failed to resolve: not a module `Y`
+   |               ^ not a module `Y`
 
 error[E0576]: cannot find associated type `N` in trait `Tr`
   --> $DIR/ufcs-partially-resolved.rs:29:24
diff --git a/src/test/ui/unknown-tool-name.rs b/src/test/ui/unknown-tool-name.rs
index cd2aeb7494a..8d7a6225529 100644
--- a/src/test/ui/unknown-tool-name.rs
+++ b/src/test/ui/unknown-tool-name.rs
@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[foo::bar] //~ ERROR failed to resolve. Use of undeclared type or module `foo`
+#[foo::bar] //~ ERROR failed to resolve: use of undeclared type or module `foo`
 fn main() {}
diff --git a/src/test/ui/unknown-tool-name.stderr b/src/test/ui/unknown-tool-name.stderr
index 8381c6de83a..55096614fcd 100644
--- a/src/test/ui/unknown-tool-name.stderr
+++ b/src/test/ui/unknown-tool-name.stderr
@@ -1,8 +1,8 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `foo`
+error[E0433]: failed to resolve: use of undeclared type or module `foo`
   --> $DIR/unknown-tool-name.rs:11:3
    |
-LL | #[foo::bar] //~ ERROR failed to resolve. Use of undeclared type or module `foo`
-   |   ^^^ Use of undeclared type or module `foo`
+LL | #[foo::bar] //~ ERROR failed to resolve: use of undeclared type or module `foo`
+   |   ^^^ use of undeclared type or module `foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unresolved/unresolved-import.rs b/src/test/ui/unresolved/unresolved-import.rs
index efa74946476..4592289beeb 100644
--- a/src/test/ui/unresolved/unresolved-import.rs
+++ b/src/test/ui/unresolved/unresolved-import.rs
@@ -11,7 +11,7 @@
 // ignore-tidy-linelength
 
 use foo::bar; //~ ERROR unresolved import `foo` [E0432]
-              //~^ Maybe a missing `extern crate foo;`?
+              //~^ maybe a missing `extern crate foo;`?
 
 use bar::Baz as x; //~ ERROR unresolved import `bar::Baz` [E0432]
                    //~^ no `Baz` in `bar`. Did you mean to use `Bar`?
@@ -42,7 +42,7 @@ mod m {
     }
 
     use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432]
-                   //~^ Did you mean `self::MyEnum`?
+                   //~^ did you mean `self::MyEnum`?
 }
 
 mod items {
@@ -51,7 +51,7 @@ mod items {
     }
 
     use Enum::*; //~ ERROR unresolved import `Enum` [E0432]
-                 //~^ Did you mean `self::Enum`?
+                 //~^ did you mean `self::Enum`?
 
     fn item() {}
 }
diff --git a/src/test/ui/unresolved/unresolved-import.stderr b/src/test/ui/unresolved/unresolved-import.stderr
index 9bcebb0011a..7e98a41af10 100644
--- a/src/test/ui/unresolved/unresolved-import.stderr
+++ b/src/test/ui/unresolved/unresolved-import.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `foo`
   --> $DIR/unresolved-import.rs:13:5
    |
 LL | use foo::bar; //~ ERROR unresolved import `foo` [E0432]
-   |     ^^^ Maybe a missing `extern crate foo;`?
+   |     ^^^ maybe a missing `extern crate foo;`?
 
 error[E0432]: unresolved import `bar::Baz`
   --> $DIR/unresolved-import.rs:16:5
@@ -26,13 +26,13 @@ error[E0432]: unresolved import `MyEnum`
   --> $DIR/unresolved-import.rs:44:9
    |
 LL |     use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432]
-   |         ^^^^^^ Did you mean `self::MyEnum`?
+   |         ^^^^^^ did you mean `self::MyEnum`?
 
 error[E0432]: unresolved import `Enum`
   --> $DIR/unresolved-import.rs:53:9
    |
 LL |     use Enum::*; //~ ERROR unresolved import `Enum` [E0432]
-   |         ^^^^ Did you mean `self::Enum`?
+   |         ^^^^ did you mean `self::Enum`?
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/use/use-from-trait-xc.stderr b/src/test/ui/use/use-from-trait-xc.stderr
index f8e5e18097b..6c643dff796 100644
--- a/src/test/ui/use/use-from-trait-xc.stderr
+++ b/src/test/ui/use/use-from-trait-xc.stderr
@@ -20,19 +20,19 @@ error[E0432]: unresolved import `use_from_trait_xc::Foo`
   --> $DIR/use-from-trait-xc.rs:24:24
    |
 LL | use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private
-   |                        ^^^ Not a module `Foo`
+   |                        ^^^ not a module `Foo`
 
 error[E0432]: unresolved import `use_from_trait_xc::Foo`
   --> $DIR/use-from-trait-xc.rs:27:24
    |
 LL | use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private
-   |                        ^^^ Not a module `Foo`
+   |                        ^^^ not a module `Foo`
 
 error[E0432]: unresolved import `use_from_trait_xc::Bar`
   --> $DIR/use-from-trait-xc.rs:30:24
    |
 LL | use use_from_trait_xc::Bar::new as bnew;
-   |                        ^^^ Not a module `Bar`
+   |                        ^^^ not a module `Bar`
 
 error[E0432]: unresolved import `use_from_trait_xc::Baz::new`
   --> $DIR/use-from-trait-xc.rs:33:5
diff --git a/src/test/ui/use/use-from-trait.rs b/src/test/ui/use/use-from-trait.rs
index 29db949acd0..afa76320582 100644
--- a/src/test/ui/use/use-from-trait.rs
+++ b/src/test/ui/use/use-from-trait.rs
@@ -18,11 +18,11 @@ use Trait::C;
 
 use Foo::new;
 //~^ ERROR unresolved import `Foo` [E0432]
-//~| Not a module `Foo`
+//~| not a module `Foo`
 
 use Foo::C2;
 //~^ ERROR unresolved import `Foo` [E0432]
-//~| Not a module `Foo`
+//~| not a module `Foo`
 
 pub trait Trait {
     fn foo();
diff --git a/src/test/ui/use/use-from-trait.stderr b/src/test/ui/use/use-from-trait.stderr
index b43a32988ca..cb0fd94fa6e 100644
--- a/src/test/ui/use/use-from-trait.stderr
+++ b/src/test/ui/use/use-from-trait.stderr
@@ -20,13 +20,13 @@ error[E0432]: unresolved import `Foo`
   --> $DIR/use-from-trait.rs:19:5
    |
 LL | use Foo::new;
-   |     ^^^ Not a module `Foo`
+   |     ^^^ not a module `Foo`
 
 error[E0432]: unresolved import `Foo`
   --> $DIR/use-from-trait.rs:23:5
    |
 LL | use Foo::C2;
-   |     ^^^ Not a module `Foo`
+   |     ^^^ not a module `Foo`
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr
index 9a6d608faac..33366b2457b 100644
--- a/src/test/ui/use/use-mod/use-mod-4.stderr
+++ b/src/test/ui/use/use-mod/use-mod-4.stderr
@@ -14,7 +14,7 @@ error[E0432]: unresolved import `foo`
   --> $DIR/use-mod-4.rs:11:5
    |
 LL | use foo::self; //~ ERROR unresolved import `foo`
-   |     ^^^ Maybe a missing `extern crate foo;`?
+   |     ^^^ maybe a missing `extern crate foo;`?
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/use/use-self-type.rs b/src/test/ui/use/use-self-type.rs
index 6b5286bf0a7..1b49d358261 100644
--- a/src/test/ui/use/use-self-type.rs
+++ b/src/test/ui/use/use-self-type.rs
@@ -14,7 +14,7 @@ impl S {
     fn f() {}
     fn g() {
         use Self::f; //~ ERROR unresolved import
-        pub(in Self::f) struct Z; //~ ERROR Use of undeclared type or module `Self`
+        pub(in Self::f) struct Z; //~ ERROR use of undeclared type or module `Self`
     }
 }
 
diff --git a/src/test/ui/use/use-self-type.stderr b/src/test/ui/use/use-self-type.stderr
index 5a1e5ea2595..e4cb0f9f3d8 100644
--- a/src/test/ui/use/use-self-type.stderr
+++ b/src/test/ui/use/use-self-type.stderr
@@ -1,14 +1,14 @@
-error[E0433]: failed to resolve. Use of undeclared type or module `Self`
+error[E0433]: failed to resolve: use of undeclared type or module `Self`
   --> $DIR/use-self-type.rs:17:16
    |
-LL |         pub(in Self::f) struct Z; //~ ERROR Use of undeclared type or module `Self`
-   |                ^^^^ Use of undeclared type or module `Self`
+LL |         pub(in Self::f) struct Z; //~ ERROR use of undeclared type or module `Self`
+   |                ^^^^ use of undeclared type or module `Self`
 
 error[E0432]: unresolved import `Self`
   --> $DIR/use-self-type.rs:16:13
    |
 LL |         use Self::f; //~ ERROR unresolved import
-   |             ^^^^ Use of undeclared type or module `Self`
+   |             ^^^^ use of undeclared type or module `Self`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/use/use-super-global-path.stderr b/src/test/ui/use/use-super-global-path.stderr
index 4730653dbf9..fc4455c7d6e 100644
--- a/src/test/ui/use/use-super-global-path.stderr
+++ b/src/test/ui/use/use-super-global-path.stderr
@@ -1,10 +1,10 @@
-error[E0433]: failed to resolve. global paths cannot start with `super`
+error[E0433]: failed to resolve: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:17:11
    |
 LL |     use ::super::{S, Z}; //~ ERROR global paths cannot start with `super`
    |           ^^^^^ global paths cannot start with `super`
 
-error[E0433]: failed to resolve. global paths cannot start with `super`
+error[E0433]: failed to resolve: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:20:15
    |
 LL |         use ::super::main; //~ ERROR global paths cannot start with `super`