diff options
| author | bors <bors@rust-lang.org> | 2019-08-16 06:53:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-16 06:53:13 +0000 |
| commit | 5a6d801bf9399004a0f0a19e510d996f4686c093 (patch) | |
| tree | 3950734898164dfdf746e2fc3d0951dbb1e0b6cc /src/libsyntax/diagnostics | |
| parent | f7af19c279b8b7ea3d2c21fcbd67164af8d5d968 (diff) | |
| parent | 0bd3a852557c1e52c4c38207891e5230bfa62cdb (diff) | |
| download | rust-5a6d801bf9399004a0f0a19e510d996f4686c093.tar.gz rust-5a6d801bf9399004a0f0a19e510d996f4686c093.zip | |
Auto merge of #63627 - Centril:rollup-v8i7x5i, r=Centril
Rollup of 7 pull requests Successful merges: - #62593 (Group all ABI tests.) - #63173 (Use libunwind from llvm-project submodule for musl targets) - #63535 (Continue refactoring resolve and hygiene) - #63539 (Suggest Rust 2018 on `<expr>.await` with no such field) - #63584 (libcore: more cleanups using `#![feature(associated_type_bounds)]`) - #63612 (Do not suggest `try_into` for base types inside of macro expansions) - #63615 (Fix typo in DoubleEndedIterator::nth_back doc) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/diagnostics')
| -rw-r--r-- | src/libsyntax/diagnostics/plugin.rs | 2 |
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")), |