bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #16699 : treeman/rust/issue-8492, r=alexcrichton

Browse source 
Closes #8492.

I did not find this suggestion in the [guidelines][] but it's mentioned in the [old style guide][].

[guidelines]: https://github.com/rust-lang/rust-guidelines
[old style guide]: https://github.com/rust-lang/rust/wiki/Note-style-guide/73c864a10a8e231e2a6630e5a3461f1d3022a20a
This commit is contained in:
bors 2014-08-25 03:30:54 +00:00
commit 0b3e43d2a4
118 changed files with 266 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libsyntax/parse/parser.rs
View file

@ -414,7 +414,7 @@ impl<'a> Parser<'a> {
} else {
let token_str = Parser::token_to_string(t);
let this_token_str = self.this_token_to_string();
self.fatal(format!("expected `{}` but found `{}`",
self.fatal(format!("expected `{}`, found `{}`",
token_str,
this_token_str).as_slice())
}
@ -448,11 +448,11 @@ impl<'a> Parser<'a> {
let actual = self.this_token_to_string();
self.fatal(
(if expected.len() != 1 {
(format!("expected one of `{}` but found `{}`",
(format!("expected one of `{}`, found `{}`",
expect,
actual))
} else {
(format!("expected `{}` but found `{}`",
(format!("expected `{}`, found `{}`",
expect,
actual))
}).as_slice()
@ -1321,7 +1321,7 @@ impl<'a> Parser<'a> {
_ => {
let token_str = p.this_token_to_string();
p.fatal((format!("expected `;` or `{{` but found `{}`",
p.fatal((format!("expected `;` or `{{`, found `{}`",
token_str)).as_slice())
}
}
@ -3382,7 +3382,7 @@ impl<'a> Parser<'a> {
""
};
let tok_str = self.this_token_to_string();
self.fatal(format!("expected {}`(` or `{{`, but found `{}`",
self.fatal(format!("expected {}`(` or `{{`, found `{}`",
ident_str,
tok_str).as_slice())
}
@ -3931,7 +3931,7 @@ impl<'a> Parser<'a> {
},
_ => {
let token_str = self.this_token_to_string();
self.fatal(format!("expected `self` but found `{}`",
self.fatal(format!("expected `self`, found `{}`",
token_str).as_slice())
}
}
@ -4462,7 +4462,7 @@ impl<'a> Parser<'a> {
} else {
let token_str = self.this_token_to_string();
self.fatal(format!("expected `{}`, `(`, or `;` after struct \
name but found `{}`", "{",
name, found `{}`", "{",
token_str).as_slice())
}
@ -4493,7 +4493,7 @@ impl<'a> Parser<'a> {
let span = self.span;
let token_str = self.this_token_to_string();
self.span_fatal(span,
format!("expected `,`, or `}}` but found `{}`",
format!("expected `,`, or `}}`, found `{}`",
token_str).as_slice())
}
}
@ -4573,7 +4573,7 @@ impl<'a> Parser<'a> {
}
_ => {
let token_str = self.this_token_to_string();
self.fatal(format!("expected item but found `{}`",
self.fatal(format!("expected item, found `{}`",
token_str).as_slice())
}
}
@ -5114,7 +5114,7 @@ impl<'a> Parser<'a> {
let span = self.span;
let token_str = self.this_token_to_string();
self.span_fatal(span,
format!("expected `{}` or `fn` but found `{}`", "{",
format!("expected `{}` or `fn`, found `{}`", "{",
token_str).as_slice());
}