Update to rustc 1.23.0-nightly (6160040d8 2017-11-18)

This commit is contained in:
Chris Wong 2017-11-19 19:51:59 +13:00
parent fd43d6c006
commit cc833dd624
3 changed files with 7 additions and 4 deletions

View file

@ -5,8 +5,7 @@
- [Added] Iron 0.6 support - [Added] Iron 0.6 support
 [#107](https://github.com/lfairy/maud/pull/107)  [#107](https://github.com/lfairy/maud/pull/107)
- [Fixed] Allow braces in the boolean expression for a toggled class - [Fixed] Allow braces in the boolean expression for a toggled class
- [Fixed] Update to rustc 1.21.0-nightly (f25c2283b 2017-08-15) - [Fixed] Update to rustc 1.23.0-nightly (6160040d8 2017-11-18)
[#99](https://github.com/lfairy/maud/issues/99)
## [0.17.1] - 2017-08-11 ## [0.17.1] - 2017-08-11

View file

@ -29,7 +29,7 @@ pub fn html_debug(input: TokenStream) -> TokenStream {
fn expand(input: TokenStream) -> TokenStream { fn expand(input: TokenStream) -> TokenStream {
let output_ident = TokenTree { let output_ident = TokenTree {
kind: TokenNode::Term(Term::intern("__maud_output")), kind: TokenNode::Term(Term::intern("__maud_output")),
span: Span::default(), span: Span::def_site(),
}; };
// Heuristic: the size of the resulting markup tends to correlate with the // Heuristic: the size of the resulting markup tends to correlate with the
// code size of the template itself // code size of the template itself

View file

@ -353,17 +353,21 @@ impl Parser {
}, },
// $pat => $expr // $pat => $expr
Some(first_token) => { Some(first_token) => {
let mut span = first_token.span;
let mut body = vec![first_token]; let mut body = vec![first_token];
loop { loop {
match self.next() { match self.next() {
Some(TokenTree { kind: TokenNode::Op(',', _), .. }) => break, Some(TokenTree { kind: TokenNode::Op(',', _), .. }) => break,
Some(token) => { Some(token) => {
if let Some(bigger_span) = span.join(token.span) {
span = bigger_span;
}
body.push(token); body.push(token);
}, },
None => return self.error("unexpected end of @match arm"), None => return self.error("unexpected end of @match arm"),
} }
} }
self.block(body.into_iter().collect(), Span::default())? self.block(body.into_iter().collect(), span)?
}, },
None => return self.error("unexpected end of @match arm"), None => return self.error("unexpected end of @match arm"),
}; };