resolve: Avoid sentence breaks in diagnostics

Author: petrochenkov

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

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

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
         }
@@ -3663,7 +3663,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 {
@@ -3755,7 +3755,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);
                     }
                 }
@@ -3780,14 +3780,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])
+                        format!("could not find `{}` in `{}`", ident, path[i - 1])
                     };
                     return PathResult::Failed(ident.span, msg, is_last);
                 }

src/librustc_resolve/resolve_imports.rs

@@ -855,7 +855,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
                 ) {
                     Some((
                         span,
-                        format!("Did you mean `{}`?", names_to_string(&suggested_path[..])),
+                        format!("did you mean `{}`?", names_to_string(&suggested_path[..])),
                         note,
                     ))
                 } else {

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

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`
 }

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
 

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() {}

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
 

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