auto merge of #19415 : P1start/rust/error-message-fixes, r=alexcrichton

This is the style followed by most other error messages.

Author: bors

src/librustc/middle/resolve.rs

@@ -3239,7 +3239,7 @@ impl<'a> Resolver<'a> {
                                             segment_name),
                         }
                     } else {
-                        format!("Could not find `{}` in `{}`.",
+                        format!("Could not find `{}` in `{}`",
                                 segment_name,
                                 module_name)
                     };
@@ -4744,7 +4744,7 @@ impl<'a> Resolver<'a> {
                         Some(&DefMod(_)) => {
                             self.resolve_error(path.span, "inherent implementations are not \
                                                            allowed for types not defined in \
-                                                           the current module.");
+                                                           the current module");
                         }
                         _ => {}
                     }
@@ -5843,12 +5843,12 @@ impl<'a> Resolver<'a> {
                                     };
 
                                     if msg.len() > 0 {
-                                        msg = format!(" Did you mean {}?", msg)
+                                        msg = format!(". Did you mean {}?", msg)
                                     }
 
                                     self.resolve_error(
                                         expr.span,
-                                        format!("unresolved name `{}`.{}",
+                                        format!("unresolved name `{}`{}",
                                                 wrong_name,
                                                 msg).as_slice());
                                 }

src/librustc/middle/typeck/collect.rs

@@ -184,7 +184,7 @@ impl<'a, 'tcx> AstConv<'tcx> for CrateCtxt<'a, 'tcx> {
 
     fn ty_infer(&self, span: Span) -> Ty<'tcx> {
         span_err!(self.tcx.sess, span, E0121,
-                  "the type placeholder `_` is not allowed within types on item signatures.");
+                  "the type placeholder `_` is not allowed within types on item signatures");
         ty::mk_err()
     }
 
@@ -1715,7 +1715,7 @@ fn add_unsized_bound<'tcx,AC>(this: &AC,
                                                        the given bound is not \
                                                        a default. \
                                                        Only `Sized?` is \
-                                                       supported.",
+                                                       supported",
                                                       desc).as_slice());
                     ty::try_add_builtin_trait(this.tcx(),
                                               kind_id,

src/librustc/middle/typeck/infer/error_reporting.rs

@@ -1648,15 +1648,15 @@ impl<'a, 'tcx> ErrorReportingHelpers<'tcx> for InferCtxt<'a, 'tcx> {
                 self.tcx.sess.span_note(
                     span,
                     format!("...so that the type `{}` \
-                             will meet the declared lifetime bounds.",
+                             will meet the declared lifetime bounds",
                             self.ty_to_string(t)).as_slice());
             }
             infer::RelateDefaultParamBound(span, t) => {
                 self.tcx.sess.span_note(
                     span,
                     format!("...so that type parameter \
                              instantiated with `{}`, \
-                             will meet its declared lifetime bounds.",
+                             will meet its declared lifetime bounds",
                             self.ty_to_string(t)).as_slice());
             }
             infer::RelateRegionParamBound(span) => {

src/libsyntax/ext/asm.rs

@@ -64,7 +64,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
         match state {
             Asm => {
                 let (s, style) = match expr_to_string(cx, p.parse_expr(),
-                                                   "inline assembly must be a string literal.") {
+                                                   "inline assembly must be a string literal") {
                     Some((s, st)) => (s, st),
                     // let compilation continue
                     None => return DummyResult::expr(sp),

src/libsyntax/parse/attr.rs

@@ -99,7 +99,7 @@ impl<'a> ParserAttr for Parser<'a> {
 
         if permit_inner && self.eat(&token::Semi) {
             self.span_warn(span, "this inner attribute syntax is deprecated. \
-                           The new syntax is `#![foo]`, with a bang and no semicolon.");
+                           The new syntax is `#![foo]`, with a bang and no semicolon");
             style = ast::AttrInner;
         }
 

src/libsyntax/parse/lexer/mod.rs

@@ -809,7 +809,7 @@ impl<'a> StringReader<'a> {
                                     self.span_diagnostic.span_help(
                                         sp,
                                         "this is an isolated carriage return; consider checking \
-                                         your editor and version control settings.")
+                                         your editor and version control settings")
                                 }
                                 false
                             }

src/test/compile-fail-fulldeps/phase-syntax-doesnt-resolve.rs

@@ -20,5 +20,5 @@ extern crate macro_crate_test;
 fn main() {
     macro_crate_test::foo();
     //~^ ERROR failed to resolve. Use of undeclared module `macro_crate_test`
-    //~^^ ERROR unresolved name `macro_crate_test::foo`.
+    //~^^ ERROR unresolved name `macro_crate_test::foo`
 }

src/test/compile-fail/does-nothing.rs

@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name `this_does_nothing_what_the`.
+// error-pattern: unresolved name `this_does_nothing_what_the`
 fn main() { println!("doing"); this_does_nothing_what_the; println!("boing"); }

src/test/compile-fail/import2.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use baz::zed::bar;
-//~^ ERROR unresolved import `baz::zed::bar`. Could not find `zed` in `baz`.
+//~^ ERROR unresolved import `baz::zed::bar`. Could not find `zed` in `baz`
 
 
 mod baz {}

src/test/compile-fail/issue-1476.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    println!("{}", x); //~ ERROR unresolved name `x`.
+    println!("{}", x); //~ ERROR unresolved name `x`
 }