diff options
| author | bors <bors@rust-lang.org> | 2014-11-30 19:46:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-30 19:46:53 +0000 |
| commit | acad03a420186ee8f0c28626e59eee55664dd0b4 (patch) | |
| tree | 0a359ba122659439261ddc091e97628bdc1219c7 /src/libsyntax | |
| parent | 3ee471cab5ed17b14484c636c02d95fa1699e76f (diff) | |
| parent | 432adc675e2955cbc639cbecf318dc23e053e7e2 (diff) | |
| download | rust-acad03a420186ee8f0c28626e59eee55664dd0b4.tar.gz rust-acad03a420186ee8f0c28626e59eee55664dd0b4.zip | |
auto merge of #19415 : P1start/rust/error-message-fixes, r=alexcrichton
This is the style followed by most other error messages.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index a1c4c0a0a10..a0999d9eee9 100644 --- a/src/libsyntax/ext/asm.rs +++ b/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), diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index 0c919daa8ed..db7bc6c323f 100644 --- a/src/libsyntax/parse/attr.rs +++ b/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; } diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index b5358e7d485..57983a6dee6 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/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 } |
