Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

suggest removing impl in generic trait bound position #115347

Merged
merged 1 commit into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 26 additions & 12 deletions compiler/rustc_parse/src/parser/ty.rs
Expand Up @@ -891,18 +891,32 @@ impl<'a> Parser<'a> {
// that we do not use the try operator when parsing the type because
// if it fails then we get a parser error which we don't want (we're trying
// to recover from errors, not make more).
let path = if self.may_recover()
&& matches!(ty.kind, TyKind::Ptr(..) | TyKind::Ref(..))
&& let TyKind::Path(_, path) = &ty.peel_refs().kind {
// Just get the indirection part of the type.
let span = ty.span.until(path.span);

err.span_suggestion_verbose(
span,
"consider removing the indirection",
"",
Applicability::MaybeIncorrect,
);
let path = if self.may_recover() {
let (span, message, sugg, path, applicability) = match &ty.kind {
TyKind::Ptr(..) | TyKind::Ref(..) if let TyKind::Path(_, path) = &ty.peel_refs().kind => {
(
ty.span.until(path.span),
"consider removing the indirection",
"",
path,
Applicability::MaybeIncorrect
)
}
TyKind::ImplTrait(_, bounds)
if let [GenericBound::Trait(tr, ..), ..] = bounds.as_slice() =>
{
(
ty.span.until(tr.span),
"use the trait bounds directly",
"",
&tr.trait_ref.path,
Applicability::MachineApplicable
)
}
_ => return Err(err)
};

err.span_suggestion_verbose(span, message, sugg, applicability);

path.clone()
} else {
Expand Down
14 changes: 14 additions & 0 deletions tests/ui/associated-type-bounds/suggest-removing-impl.rs
@@ -0,0 +1,14 @@
trait Tr {
y21 marked this conversation as resolved.
Show resolved Hide resolved
type Assoc: impl Sized;
//~^ ERROR expected a trait, found type
//~| HELP use the trait bounds directly

fn fn_with_generics<T>()
where
T: impl Sized
//~^ ERROR expected a trait, found type
//~| HELP use the trait bounds directly
{}
}

fn main() {}
26 changes: 26 additions & 0 deletions tests/ui/associated-type-bounds/suggest-removing-impl.stderr
@@ -0,0 +1,26 @@
error: expected a trait, found type
--> $DIR/suggest-removing-impl.rs:2:17
|
LL | type Assoc: impl Sized;
| ^^^^^^^^^^
|
help: use the trait bounds directly
|
LL - type Assoc: impl Sized;
LL + type Assoc: Sized;
|

error: expected a trait, found type
--> $DIR/suggest-removing-impl.rs:8:12
|
LL | T: impl Sized
| ^^^^^^^^^^
|
help: use the trait bounds directly
|
LL - T: impl Sized
LL + T: Sized
|

error: aborting due to 2 previous errors