bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #33900 - GuillaumeGomez:rollup, r=GuillaumeGomez

Browse source 
Rollup of 10 pull requests

- Successful merges: #33753, #33815, #33829, #33858, #33865, #33866, #33870, #33874, #33891, #33898
- Failed merges:
This commit is contained in:
bors 2016-05-27 03:56:19 -07:00
commit ab7c35fa0f
30 changed files with 615 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2683,7 +2683,10 @@ impl<'a> Parser<'a> {
return Ok(TokenTree::Token(sp, SpecialVarNt(SpecialMacroVar::CrateMacroVar)));
} else {
sp = mk_sp(sp.lo, self.span.hi);
self.parse_ident()?
self.parse_ident().unwrap_or_else(|mut e| {
e.emit();
keywords::Invalid.ident()
})
}
}
token::SubstNt(name) => {
@ -2788,14 +2791,14 @@ impl<'a> Parser<'a> {
let span = Span { hi: close_span.hi, ..pre_span };
match self.token {
// Correct delmiter.
// Correct delimiter.
token::CloseDelim(d) if d == delim => {
self.open_braces.pop().unwrap();
// Parse the close delimiter.
self.bump();
}
// Incorect delimiter.
// Incorrect delimiter.
token::CloseDelim(other) => {
let token_str = self.this_token_to_string();
let mut err = self.diagnostic().struct_span_err(self.span,
@ -2810,9 +2813,9 @@ impl<'a> Parser<'a> {
self.open_braces.pop().unwrap();
// If the incorrect delimter matches an earlier opening
// If the incorrect delimiter matches an earlier opening
// delimiter, then don't consume it (it can be used to
// close the earlier one)Otherwise, consume it.
// close the earlier one). Otherwise, consume it.
// E.g., we try to recover from:
// fn foo() {
// bar(baz(
@ -2826,7 +2829,7 @@ impl<'a> Parser<'a> {
// and an error emitted then. Thus we don't pop from
// self.open_braces here.
},
_ => unreachable!(),
_ => {}
}
Ok(TokenTree::Delimited(span, Rc::new(Delimited {
@ -2840,7 +2843,7 @@ impl<'a> Parser<'a> {
// invariants: the current token is not a left-delimiter,
// not an EOF, and not the desired right-delimiter (if
// it were, parse_seq_to_before_end would have prevented
// reaching this point.
// reaching this point).
maybe_whole!(deref self, NtTT);
match self.token {
token::CloseDelim(_) => {