mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #130149 - GrigorenkoPV:lifetime-suggestion, r=cjgillot

Browse Source 
Helper function for formatting with `LifetimeSuggestionPosition`
This commit is contained in:
Jubilee 2024-09-09 19:20:38 -07:00 committed by GitHub
commit 68ae3b27f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_hir/src/hir.rs
View File

@ -168,6 +168,19 @@ pub fn suggestion_position(&self) -> (LifetimeSuggestionPosition, Span) {
(LifetimeSuggestionPosition::Normal, self.ident.span) (LifetimeSuggestionPosition::Normal, self.ident.span)
} }
} }
pub fn suggestion(&self, new_lifetime: &str) -> (Span, String) {
debug_assert!(new_lifetime.starts_with('\''));
let (pos, span) = self.suggestion_position();
let code = match pos {
LifetimeSuggestionPosition::Normal => format!("{new_lifetime}"),
LifetimeSuggestionPosition::Ampersand => format!("{new_lifetime} "),
LifetimeSuggestionPosition::ElidedPath => format!("<{new_lifetime}>"),
LifetimeSuggestionPosition::ElidedPathArgument => format!("{new_lifetime}, "),
LifetimeSuggestionPosition::ObjectDefault => format!("+ {new_lifetime}"),
};
(span, code)
}
} }
/// A `Path` is essentially Rust's notion of a name; for instance, /// A `Path` is essentially Rust's notion of a name; for instance,

18
compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
View File

@ -1191,23 +1191,7 @@ fn resolve_lifetime_ref(
(generics.span, "<'a>".to_owned()) (generics.span, "<'a>".to_owned())
}; };
let lifetime_sugg = match lifetime_ref.suggestion_position() { let lifetime_sugg = lifetime_ref.suggestion("'a");
(hir::LifetimeSuggestionPosition::Normal, span) => {
(span, "'a".to_owned())
}
(hir::LifetimeSuggestionPosition::Ampersand, span) => {
(span, "'a ".to_owned())
}
(hir::LifetimeSuggestionPosition::ElidedPath, span) => {
(span, "<'a>".to_owned())
}
(hir::LifetimeSuggestionPosition::ElidedPathArgument, span) => {
(span, "'a, ".to_owned())
}
(hir::LifetimeSuggestionPosition::ObjectDefault, span) => {
(span, "+ 'a".to_owned())
}
};
let suggestions = vec![lifetime_sugg, new_param_sugg]; let suggestions = vec![lifetime_sugg, new_param_sugg];
diag.span_label( diag.span_label(

13
compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
View File

@ -852,18 +852,7 @@ struct LifetimeReplaceVisitor<'tcx, 'a> {
impl<'hir, 'tcx> hir::intravisit::Visitor<'hir> for LifetimeReplaceVisitor<'tcx, '_> { impl<'hir, 'tcx> hir::intravisit::Visitor<'hir> for LifetimeReplaceVisitor<'tcx, '_> {
fn visit_lifetime(&mut self, lt: &'hir hir::Lifetime) { fn visit_lifetime(&mut self, lt: &'hir hir::Lifetime) {
if lt.res == self.needle { if lt.res == self.needle {
let (pos, span) = lt.suggestion_position(); self.add_lt_suggs.push(lt.suggestion(self.new_lt));
let new_lt = &self.new_lt;
let sugg = match pos {
hir::LifetimeSuggestionPosition::Normal => format!("{new_lt}"),
hir::LifetimeSuggestionPosition::Ampersand => format!("{new_lt} "),
hir::LifetimeSuggestionPosition::ElidedPath => format!("<{new_lt}>"),
hir::LifetimeSuggestionPosition::ElidedPathArgument => {
format!("{new_lt}, ")
}
hir::LifetimeSuggestionPosition::ObjectDefault => format!("+ {new_lt}"),
};
self.add_lt_suggs.push((span, sugg));
} }
} }