nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues 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

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

@ -3105,59 +3105,64 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
owned_sugg = true;
}
if let Some(ty) = lt_finder.found {
if let TyKind::Path(None, path @ Path { segments, .. }) = &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.
let path: Vec<_> = Segment::from_path(path);
match self.resolve_path(&path, Some(TypeNS), None) {
PathResult::Module(
ModuleOrUniformRoot::Module(module),
) => {
match module.res() {
Some(Res::PrimTy(..)) => {}
Some(Res::Def(
DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::ForeignTy
| DefKind::AssocTy
| DefKind::OpaqueTy
| DefKind::TyParam,
_,
)) => {}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
if let TyKind::Path(None, path) = &ty.kind {
// Check if the path being borrowed is likely to be owned.
let path: Vec<_> = Segment::from_path(path);
match self.resolve_path(&path, Some(TypeNS), None) {
PathResult::Module(
ModuleOrUniformRoot::Module(module),
) => {
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::Def(
DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::ForeignTy
| DefKind::AssocTy
| DefKind::OpaqueTy
| DefKind::TyParam,
_,
)) => {}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
}
PathResult::NonModule(res) => {
match res.base_res() {
Res::PrimTy(..) => {}
Res::Def(
DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::ForeignTy
| DefKind::AssocTy
| DefKind::OpaqueTy
| DefKind::TyParam,
_,
) => {}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
}
PathResult::NonModule(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::Def(
DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::ForeignTy
| DefKind::AssocTy
| DefKind::OpaqueTy
| DefKind::TyParam,
_,
) => {}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
}
_ => { // Do not suggest in all other cases.
owned_sugg = false;
}
}
}