Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2014-10-30 09:13:02 -07:00
parent c10c163377
commit 6fcba8826f
8 changed files with 17 additions and 16 deletions

View file

@ -540,7 +540,7 @@ fn mk_delim(cx: &ExtCtxt, sp: Span, delim: token::DelimToken) -> P<ast::Expr> {
mk_token_path(cx, sp, name)
}
#[allow(non_uppercase_statics)] // NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper_case_globals)]
fn mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> P<ast::Expr> {
match *tok {
token::BinOp(binop) => {