From 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 6 Jan 2015 15:57:50 -0800 Subject: Test fixes and rebase conflicts --- src/libsyntax/parse/parser.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0ba9f23fc11..92e0395eca4 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2613,7 +2613,7 @@ impl<'a> Parser<'a> { |p| p.parse_token_tree() ); let (sep, repeat) = self.parse_sep_and_kleene_op(); - let name_num = macro_parser::count_names(seq[]); + let name_num = macro_parser::count_names(seq.as_slice()); return TtSequence(mk_sp(sp.lo, seq_span.hi), Rc::new(SequenceRepetition { tts: seq, @@ -2656,7 +2656,7 @@ impl<'a> Parser<'a> { match self.token { token::SubstNt(name, _) => self.fatal(format!("unknown macro variable `{}`", - token::get_ident(name))[]), + token::get_ident(name)).index(&FullRange)), _ => {} } } -- cgit 1.4.1-3-g733a5