about summary refs log tree commit diff
path: root/src/libsyntax/ext/tt
diff options
context:
space:
mode:
authorGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-03 23:31:06 +0100
committerGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-06 11:59:10 +0100
commit8b12d3ddf981e5450d8159b29db6ee2197064c8a (patch)
treeb15555d7f66257a4a2dbd58aa6e14db9a3521f61 /src/libsyntax/ext/tt
parent12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284 (diff)
downloadrust-8b12d3ddf981e5450d8159b29db6ee2197064c8a.tar.gz
rust-8b12d3ddf981e5450d8159b29db6ee2197064c8a.zip
Libsyntax has been updated
Diffstat (limited to 'src/libsyntax/ext/tt')
-rw-r--r--src/libsyntax/ext/tt/macro_parser.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs
index da233c79ea4..21c65d7fbf6 100644
--- a/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@ -99,7 +99,6 @@ use std::mem;
 use std::rc::Rc;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Vacant, Occupied};
-use std::ops::Deref;
 
 // To avoid costly uniqueness checks, we require that `MatchSeq` always has
 // a nonempty body.
@@ -230,7 +229,7 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
                         p_s.span_diagnostic
                            .span_fatal(sp,
                                        &format!("duplicated bind name: {}",
-                                               string.deref())[])
+                                               &string[])[])
                     }
                 }
             }
@@ -488,7 +487,7 @@ pub fn parse(sess: &ParseSess,
                     let name_string = token::get_ident(name);
                     let match_cur = ei.match_cur;
                     (&mut ei.matches[match_cur]).push(Rc::new(MatchedNonterminal(
-                        parse_nt(&mut rust_parser, span, name_string.deref()))));
+                        parse_nt(&mut rust_parser, span, &name_string[]))));
                     ei.idx += 1us;
                     ei.match_cur += 1;
                   }