badmanners/maud
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Rust

Browse source 
See
This commit is contained in:
Chris Wong 2016-02-13 13:48:09 +11:00
parent b738d9d533
commit 4e7bd32c12
1 changed files with 8 additions and 9 deletions

17
maud_macros/src/parse.rs
View file

@ -1,6 +1,6 @@
use std::mem; use std::mem;
use std::rc::Rc; use std::rc::Rc;
use syntax::ast::{Expr, ExprParen, Lit, Stmt, TokenTree, Delimited}; use syntax::ast::{Delimited, Expr, ExprKind, Lit, LitKind, Stmt, TokenTree};
use syntax::ext::quote::rt::ToTokens; use syntax::ext::quote::rt::ToTokens;
use syntax::codemap::Span; use syntax::codemap::Span;
use syntax::errors::{DiagnosticBuilder, FatalError}; use syntax::errors::{DiagnosticBuilder, FatalError};
@ -573,20 +573,19 @@ impl<'cx, 'i> Parser<'cx, 'i> {
/// Converts a literal to a string. /// Converts a literal to a string.
fn lit_to_string(cx: &ExtCtxt, lit: Lit, minus: bool) -> PResult<String> { fn lit_to_string(cx: &ExtCtxt, lit: Lit, minus: bool) -> PResult<String> {
use syntax::ast::Lit_::*;
let mut result = String::new(); let mut result = String::new();
if minus { if minus {
result.push('-'); result.push('-');
} }
match lit.node { match lit.node {
LitStr(s, _) => result.push_str(&s), LitKind::Str(s, _) => result.push_str(&s),
LitByteStr(..) | LitByte(..) => { LitKind::ByteStr(..) | LitKind::Byte(..) => {
error!(cx, lit.span, "cannot splice binary data"); error!(cx, lit.span, "cannot splice binary data");
}, },
LitChar(c) => result.push(c), LitKind::Char(c) => result.push(c),
LitInt(x, _) => result.push_str(&x.to_string()), LitKind::Int(x, _) => result.push_str(&x.to_string()),
LitFloat(s, _) | LitFloatUnsuffixed(s) => result.push_str(&s), LitKind::Float(s, _) | LitKind::FloatUnsuffixed(s) => result.push_str(&s),
LitBool(b) => result.push_str(if b { "true" } else { "false" }), LitKind::Bool(b) => result.push_str(if b { "true" } else { "false" }),
}; };
Ok(result) Ok(result)
} }
@ -594,7 +593,7 @@ fn lit_to_string(cx: &ExtCtxt, lit: Lit, minus: bool) -> PResult<String> {
/// If the expression is wrapped in parentheses, strip them off. /// If the expression is wrapped in parentheses, strip them off.
fn strip_outer_parens(expr: P<Expr>) -> P<Expr> { fn strip_outer_parens(expr: P<Expr>) -> P<Expr> {
expr.and_then(|expr| match expr { expr.and_then(|expr| match expr {
Expr { node: ExprParen(inner), .. } => inner, Expr { node: ExprKind::Paren(inner), .. } => inner,
expr => P(expr), expr => P(expr),
}) })
} }