bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Using multipart suggestion

Browse source
This commit is contained in:
stoozy 2022-09-26 22:17:47 -04:00
parent 887515af33
commit 365457bd25
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/rustc_resolve/src/late/lifetimes.rs
View file

@ -8,7 +8,7 @@
use rustc_ast::walk_list; use rustc_ast::walk_list;
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet}; use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
use rustc_errors::{struct_span_err}; use rustc_errors::struct_span_err;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def::{DefKind, Res}; use rustc_hir::def::{DefKind, Res};
use rustc_hir::def_id::LocalDefId; use rustc_hir::def_id::LocalDefId;
@ -24,7 +24,6 @@ use rustc_span::symbol::{sym, Ident};
use rustc_span::Span; use rustc_span::Span;
use std::fmt; use std::fmt;
trait RegionExt { trait RegionExt {
fn early(hir_map: Map<'_>, param: &GenericParam<'_>) -> (LocalDefId, Region); fn early(hir_map: Map<'_>, param: &GenericParam<'_>) -> (LocalDefId, Region);
@ -1320,20 +1319,28 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
&& !self.tcx.features().anonymous_lifetime_in_impl_trait && !self.tcx.features().anonymous_lifetime_in_impl_trait
{ {
match self.tcx.hir().get_generics(lifetime_ref.hir_id.owner.to_def_id().as_local().unwrap()) { match self.tcx.hir().get_generics(lifetime_ref.hir_id.owner.def_id) {
Some(generics) => { Some(generics) => {
for i in 0..generics.params.len() { for i in 0..generics.params.len() {
if !generics.span.contains(generics.params[i].span) { if !generics.span.contains(generics.params[i].span) {
struct_span_err!(
self.tcx.sess, let mut diag = rustc_session::parse::feature_err(
&self.tcx.sess.parse_sess,
sym::anonymous_lifetime_in_impl_trait,
lifetime_ref.span, lifetime_ref.span,
E0106, "anonymous lifetimes in `impl Trait` are unstable",
"missing lifetime specifier" );
)
.span_label(lifetime_ref.span, "expected named lifetime parameter") diag.span_label(lifetime_ref.span, "expected named lifetime parameter");
.span_help(generics.span, "consider introducing a named lifetime parameter")
.emit(); diag.multipart_suggestion("consider introducing a named lifetime parameter",
vec![
(lifetime_ref.span, "&'a ".to_owned()),
(generics.span, "<'a>".to_owned())
], rustc_errors::Applicability::MaybeIncorrect);
diag.emit();
return; return;
} }
} }