diff options
| author | bors <bors@rust-lang.org> | 2019-05-23 01:50:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-23 01:50:55 +0000 |
| commit | 15ccaf77911d9261d0c254be8a3e878db84792c6 (patch) | |
| tree | e79e46b214341921d8bd56d2b302b84fff00f4df /src/libsyntax/diagnostics/plugin.rs | |
| parent | 11f01bfb9f79b569aee6ac724eea59c7105a7f19 (diff) | |
| parent | a1885cdba38a63448ceec02f951ddc0844d0ff38 (diff) | |
| download | rust-15ccaf77911d9261d0c254be8a3e878db84792c6.tar.gz rust-15ccaf77911d9261d0c254be8a3e878db84792c6.zip | |
Auto merge of #60740 - petrochenkov:kw, r=nnethercote
Simplify use of keyword symbols They mirror non-keyword symbols now (see https://github.com/rust-lang/rust/pull/60630). `keywords::MyKeyword.name()` -> `kw::MyKeyword` `keywords::MyKeyword.ident()` -> `Ident::with_empty_ctxt(kw::MyKeyword)` (not common) `keywords::Invalid.ident()` -> `Ident::invalid()` (more common) Keywords are simply `Symbol` constants now, the `Keyword` struct is eliminated. This means `kw::MyKeyword` can now be used in `match` in particular.
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 c988dc61bec..e9476e2fdfd 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.rs @@ -7,7 +7,7 @@ use crate::ext::base::{ExtCtxt, MacEager, MacResult}; use crate::ext::build::AstBuilder; use crate::parse::token; use crate::ptr::P; -use crate::symbol::keywords; +use crate::symbol::kw; use crate::tokenstream::{TokenTree}; use smallvec::smallvec; @@ -185,7 +185,7 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt<'_>, (descriptions.len(), ecx.expr_vec(span, descriptions)) }); - let static_ = ecx.lifetime(span, keywords::StaticLifetime.ident()); + let static_ = ecx.lifetime(span, Ident::with_empty_ctxt(kw::StaticLifetime)); let ty_str = ecx.ty_rptr( span, ecx.ty_ident(span, ecx.ident_of("str")), |