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

Rely in resolve and not on path name for &str -> String suggestion

Browse Source
This commit is contained in:
Esteban Küber 2023-11-15 20:22:54 +00:00
parent bb9d720a16
commit 02bea16c08
1 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_resolve/src/late/diagnostics.rs
View File

@ -3105,15 +3105,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
owned_sugg = true; owned_sugg = true;
} }
if let Some(ty) = lt_finder.found { if let Some(ty) = lt_finder.found {
if let TyKind::Path(None, path @ Path { segments, .. }) = &ty.kind if let TyKind::Path(None, path) = &ty.kind {
&& segments.len() == 1
{
if segments[0].ident.name == sym::str {
// Don't suggest `-> str`, suggest `-> String`.
sugg = vec![
(lt.span.with_hi(ty.span.hi()), "String".to_string()),
];
} else {
// Check if the path being borrowed is likely to be owned. // Check if the path being borrowed is likely to be owned.
let path: Vec<_> = Segment::from_path(path); let path: Vec<_> = Segment::from_path(path);
match self.resolve_path(&path, Some(TypeNS), None) { match self.resolve_path(&path, Some(TypeNS), None) {
@ -3121,6 +3113,13 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
ModuleOrUniformRoot::Module(module), ModuleOrUniformRoot::Module(module),
) => { ) => {
match module.res() { match module.res() {
Some(Res::PrimTy(PrimTy::Str)) => {
// Don't suggest `-> str`, suggest `-> String`.
sugg = vec![(
lt.span.with_hi(ty.span.hi()),
"String".to_string(),
)];
}
Some(Res::PrimTy(..)) => {} Some(Res::PrimTy(..)) => {}
Some(Res::Def( Some(Res::Def(
DefKind::Struct DefKind::Struct
@ -3139,6 +3138,13 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
} }
PathResult::NonModule(res) => { PathResult::NonModule(res) => {
match res.base_res() { match res.base_res() {
Res::PrimTy(PrimTy::Str) => {
// Don't suggest `-> str`, suggest `-> String`.
sugg = vec![(
lt.span.with_hi(ty.span.hi()),
"String".to_string(),
)];
}
Res::PrimTy(..) => {} Res::PrimTy(..) => {}
Res::Def( Res::Def(
DefKind::Struct DefKind::Struct
@ -3160,7 +3166,6 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
} }
} }
} }
}
if let TyKind::Slice(inner_ty) = &ty.kind { if let TyKind::Slice(inner_ty) = &ty.kind {
// Don't suggest `-> [T]`, suggest `-> Vec<T>`. // Don't suggest `-> [T]`, suggest `-> Vec<T>`.
sugg = vec![ sugg = vec![