diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:57:50 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 16:10:37 -0800 |
| commit | 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2 (patch) | |
| tree | c49c538f8e87842bb6371f97ece94ceaa0bcca8e /src/libsyntax/parse | |
| parent | 26cd8eae48ea99bda183c5224bc423991ccfaf1f (diff) | |
| download | rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.tar.gz rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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)), _ => {} } } |