about summary refs log tree commit diff
path: root/src/libsyntax/ext/trace_macros.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-04-21 15:23:07 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-04-21 15:23:07 -0700
commit37a1f2e3acc75e8a3d0fd47bb345b2cd880b2937 (patch)
tree0e9af466fc2c1f4185b87f29ffe71a86ad5bcaa9 /src/libsyntax/ext/trace_macros.rs
parent957cb422a98585568558ad88ec5a0841c43961ae (diff)
parent19c8d701743922a709a4eb6554f562996b7baa27 (diff)
downloadrust-37a1f2e3acc75e8a3d0fd47bb345b2cd880b2937.tar.gz
rust-37a1f2e3acc75e8a3d0fd47bb345b2cd880b2937.zip
rollup merge of #24487: erickt/syntax
This removes the usage of `#[feature(into_cow, slice_patterns, box_syntax, box_patterns, quote, unsafe_destructor)]` from being used in libsyntax. My main desire for this is that it brings me one step closer to letting [syntex](https://github.com/erickt/rust-syntex) compile with stable rust. Hopefully this doesn't inconvenience rust development.
Diffstat (limited to 'src/libsyntax/ext/trace_macros.rs')
-rw-r--r--src/libsyntax/ext/trace_macros.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs
index 3fcc6a8d692..646e6fec405 100644
--- a/src/libsyntax/ext/trace_macros.rs
+++ b/src/libsyntax/ext/trace_macros.rs
@@ -28,12 +28,11 @@ pub fn expand_trace_macros(cx: &mut ExtCtxt,
         return base::DummyResult::any(sp);
     }
 
-
-    match tt {
-        [ast::TtToken(_, ref tok)] if tok.is_keyword(keywords::True) => {
+    match (tt.len(), tt.first()) {
+        (1, Some(&ast::TtToken(_, ref tok))) if tok.is_keyword(keywords::True) => {
             cx.set_trace_macros(true);
         }
-        [ast::TtToken(_, ref tok)] if tok.is_keyword(keywords::False) => {
+        (1, Some(&ast::TtToken(_, ref tok))) if tok.is_keyword(keywords::False) => {
             cx.set_trace_macros(false);
         }
         _ => cx.span_err(sp, "trace_macros! accepts only `true` or `false`"),