Skip to content

Commit

Permalink
Update to rustc 1.17.0-nightly (b1e31766d 2017-03-03)
Browse files Browse the repository at this point in the history
Closes #77

Squashed commit of the following:

commit f88e4dfa5a62f9d6e00ed0980b6fb6d41d36151c
Author: Chris Wong <[email protected]>
Date:   Tue Mar 7 20:54:54 2017 +1300

    Convert errant tabs to spaces

commit 65936ef
Author: Sander Maijers <[email protected]>
Date:   Mon Mar 6 17:15:20 2017 +0100

    Refactor to make more generic

commit dc16b66
Author: Sander Maijers <[email protected]>
Date:   Thu Mar 2 16:47:52 2017 +0100

    Adjust to make compatible with current `libsyntax`

    Was broken since rustc nightly 2017-03-01.
  • Loading branch information
Sander Maijers authored and lambda-fairy committed Mar 7, 2017
1 parent 2339922 commit fc13564
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions maud_macros/src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl<'cx, 'a, 'i> Parser<'cx, 'a, 'i> {
// ???
_ => {
if let [ref tt, ..] = *self.input {
parse_error!(self, tt.get_span(), "invalid syntax");
parse_error!(self, tt.span(), "invalid syntax");
} else {
parse_error!(self, self.span, "unexpected end of block");
}
Expand Down Expand Up @@ -369,9 +369,7 @@ impl<'cx, 'a, 'i> Parser<'cx, 'a, 'i> {
self.shift(1);
bodies.push(tt.clone());
},
[TokenTree::Token(sp, _), ..] | [TokenTree::Delimited(sp, _), ..] | [TokenTree::Sequence(sp, _), ..] => {
bodies.append(&mut self.match_body(sp)?);
},
[ref tt, ..] => bodies.append(&mut self.match_body(tt.span())?),
}}
Ok(bodies)
}
Expand Down

0 comments on commit fc13564

Please sign in to comment.