diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-23 07:31:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-23 10:16:40 -0700 |
| commit | 82bb41bdab6d6d5611573883bea5779ed43ca184 (patch) | |
| tree | 9e9aae42ae9d4bfbf97cc7fa263a33064e471c06 /src/libsyntax_ext | |
| parent | d58abe75bbb00f6cf3287a5d490afd518962ae54 (diff) | |
| parent | 57f9c4d6d9ba7d48b9f64193dd037a54e11ef7b4 (diff) | |
| download | rust-82bb41bdab6d6d5611573883bea5779ed43ca184.tar.gz rust-82bb41bdab6d6d5611573883bea5779ed43ca184.zip | |
Merge branch 'master' of https://github.com/Lymia/rust into rollup
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/concat_idents.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax_ext/format.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax_ext/concat_idents.rs b/src/libsyntax_ext/concat_idents.rs index 8d0104e512b..d513008f0e2 100644 --- a/src/libsyntax_ext/concat_idents.rs +++ b/src/libsyntax_ext/concat_idents.rs @@ -44,7 +44,8 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt, } } else { match *e { - TokenTree::Token(_, token::Ident(ident)) => res_str.push_str(&ident.name.as_str()), + TokenTree::Token(_, token::Ident(ident, _)) => + res_str.push_str(&ident.name.as_str()), _ => { cx.span_err(sp, "concat_idents! requires ident args."); return DummyResult::expr(sp); diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 8fd95aa1ca8..d9c68e3167b 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -149,7 +149,7 @@ fn parse_args(ecx: &mut ExtCtxt, if named || (p.token.is_ident() && p.look_ahead(1, |t| *t == token::Eq)) { named = true; let ident = match p.token { - token::Ident(i) => { + token::Ident(i, _) => { p.bump(); i } |