about summary refs log tree commit diff
path: root/src/libsyntax/diagnostics/plugin.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-08-16 08:26:36 +0200
committerGitHub <noreply@github.com>2019-08-16 08:26:36 +0200
commit6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1 (patch)
tree3f954fcac1528b39e95ca78bc3ebad58a30613e0 /src/libsyntax/diagnostics/plugin.rs
parent32c10056525d427292fdb5e7db7497e2bbe9551b (diff)
parentc76277340e3e5e8d6aca9c926c45cac3484eb5f8 (diff)
downloadrust-6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1.tar.gz
rust-6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1.zip
Rollup merge of #63535 - petrochenkov:expndata, r=matthewjasper
Continue refactoring resolve and hygiene

The general goal is addressing FIXMEs from the previous PRs.

Merging similar data structures (+ prerequisites for such merging), accounting for the fact that all `ExpnId`s have associated data in `HygieneData` now (less `Option`s).

Also, some renaming.
This should be the last renaming session in this area, I think.

r? @matthewjasper
Diffstat (limited to 'src/libsyntax/diagnostics/plugin.rs')
-rw-r--r--src/libsyntax/diagnostics/plugin.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs
index 80591ad304d..9618b5acfb0 100644
--- a/src/libsyntax/diagnostics/plugin.rs
+++ b/src/libsyntax/diagnostics/plugin.rs
@@ -172,7 +172,7 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt<'_>,
             (descriptions.len(), ecx.expr_vec(span, descriptions))
         });
 
-    let static_ = ecx.lifetime(span, Ident::with_empty_ctxt(kw::StaticLifetime));
+    let static_ = ecx.lifetime(span, Ident::with_dummy_span(kw::StaticLifetime));
     let ty_str = ecx.ty_rptr(
         span,
         ecx.ty_ident(span, ecx.ident_of("str")),