mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #111610 - bvanjoi:fix-99597, r=compiler-errors

Browse source 
fix(diagnostic): wrap parens for ref impl trait param

Fixes https://github.com/rust-lang/rust/issues/99597

When parameters are an `impl_trait` which it needed to add trait, and it is a reference, add parentheses to the type of the parameter in the suggestion
This commit is contained in:
Matthias Krüger 2023-05-16 20:12:18 +02:00 • committed by GitHub
commit d2e52ea127
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
compiler/rustc_hir_typeck/src/method/suggest.rs
View file

@ -2633,33 +2633,49 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Nothing,
}
let ast_generics = hir.get_generics(id.owner.def_id).unwrap();
let (sp, mut introducer) = if let Some(span) =
ast_generics.bounds_span_for_suggestions(def_id)
{
(span, Introducer::Plus)
} else if let Some(colon_span) = param.colon_span {
(colon_span.shrink_to_hi(), Introducer::Nothing)
} else {
(param.span.shrink_to_hi(), Introducer::Colon)
};
if matches!(
param.kind,
hir::GenericParamKind::Type { synthetic: true, .. },
) {
introducer = Introducer::Plus
}
let trait_def_ids: FxHashSet<DefId> = ast_generics
.bounds_for_param(def_id)
.flat_map(|bp| bp.bounds.iter())
.filter_map(|bound| bound.trait_ref()?.trait_def_id())
.collect();
if !candidates.iter().any(|t| trait_def_ids.contains(&t.def_id)) {
err.span_suggestions(
sp,
message(format!(
if candidates.iter().any(|t| trait_def_ids.contains(&t.def_id)) {
return;
}
let msg = message(format!(
"restrict type parameter `{}` with",
param.name.ident(),
)),
));
let bounds_span = ast_generics.bounds_span_for_suggestions(def_id);
if rcvr_ty.is_ref() && param.is_impl_trait() && bounds_span.is_some() {
err.multipart_suggestions(
msg,
candidates.iter().map(|t| {
vec![
(param.span.shrink_to_lo(), "(".to_string()),
(
bounds_span.unwrap(),
format!(" + {})", self.tcx.def_path_str(t.def_id)),
),
]
}),
Applicability::MaybeIncorrect,
);
return;
}
let (sp, introducer) = if let Some(span) = bounds_span {
(span, Introducer::Plus)
} else if let Some(colon_span) = param.colon_span {
(colon_span.shrink_to_hi(), Introducer::Nothing)
} else if param.is_impl_trait() {
(param.span.shrink_to_hi(), Introducer::Plus)
} else {
(param.span.shrink_to_hi(), Introducer::Colon)
};
err.span_suggestions(
sp,
msg,
candidates.iter().map(|t| {
format!(
"{} {}",
@ -2668,12 +2684,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Introducer::Colon => ":",
Introducer::Nothing => "",
},
self.tcx.def_path_str(t.def_id),
self.tcx.def_path_str(t.def_id)
)
}),
Applicability::MaybeIncorrect,
);
}
return;
}
Node::Item(hir::Item {

15
tests/ui/suggestions/issue-99597.rs Normal file
View file

@ -0,0 +1,15 @@
#![allow(dead_code)]
trait T1 { }
trait T2 {
fn test(&self) { }
}
fn go(s: &impl T1) {
//~^ SUGGESTION (
s.test();
//~^ ERROR no method named `test`
}
fn main() { }

15
tests/ui/suggestions/issue-99597.stderr Normal file
View file

@ -0,0 +1,15 @@
error[E0599]: no method named `test` found for reference `&impl T1` in the current scope
--> $DIR/issue-99597.rs:11:7
|
LL | s.test();
| ^^^^ method not found in `&impl T1`
|
= help: items from traits can only be used if the type parameter is bounded by the trait
help: the following trait defines an item `test`, perhaps you need to restrict type parameter `impl T1` with it:
|
LL | fn go(s: &(impl T1 + T2)) {
| + +++++
error: aborting due to previous error
For more information about this error, try `rustc --explain E0599`.