diff options
| author | bors <bors@rust-lang.org> | 2019-05-23 13:28:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-23 13:28:27 +0000 |
| commit | 27cc0db7a248308fc2634ac68d7608a20b4a1c09 (patch) | |
| tree | fa99e0dafd4ffae806ccad46fd9f26348d1a17bc /src/libsyntax/diagnostics/plugin.rs | |
| parent | f688ba608923bdbf6b46ec65af2f6464b6233a75 (diff) | |
| parent | 90d15e770419fb4ae8e120909baafc35ef243947 (diff) | |
| download | rust-27cc0db7a248308fc2634ac68d7608a20b4a1c09.tar.gz rust-27cc0db7a248308fc2634ac68d7608a20b4a1c09.zip | |
Auto merge of #60965 - petrochenkov:lit3, r=matklad
syntax: Continue refactoring literals A follow up to https://github.com/rust-lang/rust/pull/60679. https://github.com/rust-lang/rust/commit/a2fd002bd5a91ba7997057724b72b9dac8fae550: Similarly to `EscapeError`, literal parsing now produces a `LitError`. This way we can get rid of `diag: Option<(Span, &Handler)>` in interfaces while leaving attr/mod alone. https://github.com/rust-lang/rust/commit/d9516d11208456d4a17fe68a34c1d0a00334e62c: Gathers all components of a literal token in a single struct.
Diffstat (limited to 'src/libsyntax/diagnostics/plugin.rs')
| -rw-r--r-- | src/libsyntax/diagnostics/plugin.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs index e9476e2fdfd..0c57c23b2b5 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.rs @@ -77,8 +77,8 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt<'_>, }, (3, Some(&TokenTree::Token(_, token::Ident(ref code, _))), Some(&TokenTree::Token(_, token::Comma)), - Some(&TokenTree::Token(_, token::Literal(token::StrRaw(description, _), None)))) => { - (code, Some(description)) + Some(&TokenTree::Token(_, token::Literal(token::Lit { symbol, .. })))) => { + (code, Some(symbol)) } _ => unreachable!() }; |