diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 09:13:02 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 17:37:56 -0700 |
| commit | 6fcba8826fd26028341a35d88b07208378ac05ea (patch) | |
| tree | c72f2a907d7fc13d914e31dcc0b4dc6527d1f262 /src/libsyntax/ext | |
| parent | c10c1633772aae3075f1d24c7741a074ddde5527 (diff) | |
| download | rust-6fcba8826fd26028341a35d88b07208378ac05ea.tar.gz rust-6fcba8826fd26028341a35d88b07208378ac05ea.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 2151f79cd7b..f751655c9ff 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -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) => { |