Rollup merge of #126054 - veera-sivarajan:bugfix-113073-bound-on-generics-2, r=fee1-dead

`E0229`: Suggest Moving Type Constraints to Type Parameter Declaration

Fixes #113073

This PR suggests  `impl<T: Bound> Trait<T> for Foo` when finding `impl Trait<T: Bound> for Foo`. Tangentially, it also improves a handful of other error messages.

It accomplishes this in two steps:
1. Check if constrained arguments and parameter names appear in the same order and delay emitting "incorrect number of generic arguments" error because it can be confusing for the programmer to see `0 generic arguments provided` when there are `n` constrained generic arguments.

2. Inside `E0229`, suggest declaring the type parameter right after the `impl` keyword by finding the relevant impl block's span for type parameter declaration. This also handles lifetime declarations correctly.

Also, the multi part suggestion doesn't use the fluent error mechanism because translating all the errors to fluent style feels outside the scope of this PR. I will handle it in a separate PR if this gets approved.
This commit is contained in:
Matthias Krüger 2024-06-14 12:23:36 +02:00 committed by GitHub
commit bfe032334f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 263 additions and 101 deletions

View File

@ -2471,6 +2471,15 @@ pub enum AssocItemConstraintKind<'hir> {
Bound { bounds: &'hir [GenericBound<'hir>] }, Bound { bounds: &'hir [GenericBound<'hir>] },
} }
impl<'hir> AssocItemConstraintKind<'hir> {
pub fn descr(&self) -> &'static str {
match self {
AssocItemConstraintKind::Equality { .. } => "binding",
AssocItemConstraintKind::Bound { .. } => "constraint",
}
}
}
#[derive(Debug, Clone, Copy, HashStable_Generic)] #[derive(Debug, Clone, Copy, HashStable_Generic)]
pub struct Ty<'hir> { pub struct Ty<'hir> {
pub hir_id: HirId, pub hir_id: HirId,
@ -3763,6 +3772,21 @@ impl<'hir> Node<'hir> {
} }
} }
/// Get a `hir::Impl` if the node is an impl block for the given `trait_def_id`.
pub fn impl_block_of_trait(self, trait_def_id: DefId) -> Option<&'hir Impl<'hir>> {
match self {
Node::Item(Item { kind: ItemKind::Impl(impl_block), .. })
if impl_block
.of_trait
.and_then(|trait_ref| trait_ref.trait_def_id())
.is_some_and(|trait_id| trait_id == trait_def_id) =>
{
Some(impl_block)
}
_ => None,
}
}
pub fn fn_sig(self) -> Option<&'hir FnSig<'hir>> { pub fn fn_sig(self) -> Option<&'hir FnSig<'hir>> {
match self { match self {
Node::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. }) Node::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })

View File

@ -1217,7 +1217,6 @@ pub fn prohibit_assoc_item_constraint(
// otherwise suggest the removal of the binding. // otherwise suggest the removal of the binding.
if let Some((def_id, segment, _)) = segment if let Some((def_id, segment, _)) = segment
&& segment.args().parenthesized == hir::GenericArgsParentheses::No && segment.args().parenthesized == hir::GenericArgsParentheses::No
&& let hir::AssocItemConstraintKind::Equality { term } = constraint.kind
{ {
// Suggests removal of the offending binding // Suggests removal of the offending binding
let suggest_removal = |e: &mut Diag<'_>| { let suggest_removal = |e: &mut Diag<'_>| {
@ -1263,7 +1262,7 @@ pub fn prohibit_assoc_item_constraint(
if let Ok(suggestion) = tcx.sess.source_map().span_to_snippet(removal_span) { if let Ok(suggestion) = tcx.sess.source_map().span_to_snippet(removal_span) {
e.span_suggestion_verbose( e.span_suggestion_verbose(
removal_span, removal_span,
"consider removing this associated item binding", format!("consider removing this associated item {}", constraint.kind.descr()),
suggestion, suggestion,
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
@ -1286,19 +1285,73 @@ pub fn prohibit_assoc_item_constraint(
// Check if the type has a generic param with the same name // Check if the type has a generic param with the same name
// as the assoc type name in the associated item binding. // as the assoc type name in the associated item binding.
let generics = tcx.generics_of(def_id); let generics = tcx.generics_of(def_id);
let matching_param = let matching_param = generics.own_params.iter().find(|p| p.name == constraint.ident.name);
generics.own_params.iter().find(|p| p.name.as_str() == constraint.ident.as_str());
// Now emit the appropriate suggestion // Now emit the appropriate suggestion
if let Some(matching_param) = matching_param { if let Some(matching_param) = matching_param {
match (&matching_param.kind, term) { match (constraint.kind, &matching_param.kind) {
(GenericParamDefKind::Type { .. }, hir::Term::Ty(ty)) => { (
suggest_direct_use(&mut err, ty.span); hir::AssocItemConstraintKind::Equality { term: hir::Term::Ty(ty) },
} GenericParamDefKind::Type { .. },
(GenericParamDefKind::Const { .. }, hir::Term::Const(c)) => { ) => suggest_direct_use(&mut err, ty.span),
(
hir::AssocItemConstraintKind::Equality { term: hir::Term::Const(c) },
GenericParamDefKind::Const { .. },
) => {
let span = tcx.hir().span(c.hir_id); let span = tcx.hir().span(c.hir_id);
suggest_direct_use(&mut err, span); suggest_direct_use(&mut err, span);
} }
(hir::AssocItemConstraintKind::Bound { bounds }, _) => {
// Suggest `impl<T: Bound> Trait<T> for Foo` when finding
// `impl Trait<T: Bound> for Foo`
// Get the parent impl block based on the binding we have
// and the trait DefId
let impl_block = tcx
.hir()
.parent_iter(constraint.hir_id)
.find_map(|(_, node)| node.impl_block_of_trait(def_id));
let type_with_constraints =
tcx.sess.source_map().span_to_snippet(constraint.span);
if let Some(impl_block) = impl_block
&& let Ok(type_with_constraints) = type_with_constraints
{
// Filter out the lifetime parameters because
// they should be declared before the type parameter
let lifetimes: String = bounds
.iter()
.filter_map(|bound| {
if let hir::GenericBound::Outlives(lifetime) = bound {
Some(format!("{lifetime}, "))
} else {
None
}
})
.collect();
// Figure out a span and suggestion string based on
// whether there are any existing parameters
let param_decl = if let Some(param_span) =
impl_block.generics.span_for_param_suggestion()
{
(param_span, format!(", {lifetimes}{type_with_constraints}"))
} else {
(
impl_block.generics.span.shrink_to_lo(),
format!("<{lifetimes}{type_with_constraints}>"),
)
};
let suggestions =
vec![param_decl, (constraint.span, format!("{}", matching_param.name))];
err.multipart_suggestion_verbose(
format!("declare the type parameter right after the `impl` keyword"),
suggestions,
Applicability::MaybeIncorrect,
);
}
}
_ => suggest_removal(&mut err), _ => suggest_removal(&mut err),
} }
} else { } else {

View File

@ -531,6 +531,7 @@ pub(crate) fn check_generic_arg_count(
let num_default_params = expected_max - expected_min; let num_default_params = expected_max - expected_min;
let mut all_params_are_binded = false;
let gen_args_info = if provided > expected_max { let gen_args_info = if provided > expected_max {
invalid_args.extend((expected_max..provided).map(|i| i + args_offset)); invalid_args.extend((expected_max..provided).map(|i| i + args_offset));
let num_redundant_args = provided - expected_max; let num_redundant_args = provided - expected_max;
@ -547,6 +548,20 @@ pub(crate) fn check_generic_arg_count(
} else { } else {
let num_missing_args = expected_max - provided; let num_missing_args = expected_max - provided;
let constraint_names: Vec<_> =
gen_args.constraints.iter().map(|b| b.ident.name).collect();
let param_names: Vec<_> = gen_params
.own_params
.iter()
.filter(|param| !has_self || param.index != 0) // Assumes `Self` will always be the first parameter
.map(|param| param.name)
.collect();
if constraint_names == param_names {
// We set this to true and delay emitting `WrongNumberOfGenericArgs`
// to provide a succinct error for cases like issue #113073
all_params_are_binded = true;
};
GenericArgsInfo::MissingTypesOrConsts { GenericArgsInfo::MissingTypesOrConsts {
num_missing_args, num_missing_args,
num_default_params, num_default_params,
@ -567,7 +582,7 @@ pub(crate) fn check_generic_arg_count(
def_id, def_id,
) )
.diagnostic() .diagnostic()
.emit() .emit_unless(all_params_are_binded)
}); });
Err(reported) Err(reported)

View File

@ -5,6 +5,7 @@ pub trait Iter {
fn next<'a>(&'a mut self) -> Option<Self::Item<'a, As1: Copy>>; fn next<'a>(&'a mut self) -> Option<Self::Item<'a, As1: Copy>>;
//~^ ERROR associated item constraints are not allowed here //~^ ERROR associated item constraints are not allowed here
//~| HELP consider removing this associated item constraint
} }
impl Iter for () { impl Iter for () {

View File

@ -3,6 +3,11 @@ error[E0229]: associated item constraints are not allowed here
| |
LL | fn next<'a>(&'a mut self) -> Option<Self::Item<'a, As1: Copy>>; LL | fn next<'a>(&'a mut self) -> Option<Self::Item<'a, As1: Copy>>;
| ^^^^^^^^^ associated item constraint not allowed here | ^^^^^^^^^ associated item constraint not allowed here
|
help: consider removing this associated item constraint
|
LL | fn next<'a>(&'a mut self) -> Option<Self::Item<'a, As1: Copy>>;
| ~~~~~~~~~~~
error: aborting due to 1 previous error error: aborting due to 1 previous error

View File

@ -76,7 +76,6 @@ trait Tr3<const N: i32, T2, T3> {
impl Tr3<N impl Tr3<N
//~^ ERROR associated item constraints are not allowed here //~^ ERROR associated item constraints are not allowed here
//~| ERROR associated const equality is incomplete //~| ERROR associated const equality is incomplete
//~| ERROR trait takes 3 generic arguments but 0 generic arguments were supplied
= 42, T2 = Qux, T3 = usize> for Bar { = 42, T2 = Qux, T3 = usize> for Bar {
} }
@ -92,7 +91,6 @@ impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
// matches the const param ident but the constraint is a type arg // matches the const param ident but the constraint is a type arg
impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar { impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar {
//~^ ERROR associated item constraints are not allowed here //~^ ERROR associated item constraints are not allowed here
//~| ERROR trait takes 3 generic arguments but 0 generic arguments were supplied
} }
// Test for when equality constraint's ident // Test for when equality constraint's ident

View File

@ -5,7 +5,6 @@ LL | impl Tr3<N
| __________^ | __________^
LL | | LL | |
LL | | LL | |
LL | |
LL | | = 42, T2 = Qux, T3 = usize> for Bar { LL | | = 42, T2 = Qux, T3 = usize> for Bar {
| |____^ | |____^
| |
@ -14,7 +13,7 @@ LL | | = 42, T2 = Qux, T3 = usize> for Bar {
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: associated const equality is incomplete error[E0658]: associated const equality is incomplete
--> $DIR/associated-types-eq-2.rs:85:10 --> $DIR/associated-types-eq-2.rs:84:10
| |
LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux { LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
| ^^^^^^ | ^^^^^^
@ -24,7 +23,7 @@ LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: associated const equality is incomplete error[E0658]: associated const equality is incomplete
--> $DIR/associated-types-eq-2.rs:100:14 --> $DIR/associated-types-eq-2.rs:98:14
| |
LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar { LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar {
| ^^^^^^^ | ^^^^^^^
@ -34,7 +33,7 @@ LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar {
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: associated const equality is incomplete error[E0658]: associated const equality is incomplete
--> $DIR/associated-types-eq-2.rs:108:10 --> $DIR/associated-types-eq-2.rs:106:10
| |
LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar { LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar {
| ^^^^^^ | ^^^^^^
@ -190,22 +189,6 @@ help: to use `GenericTerm<i32>` as a generic argument specify it directly
LL | impl Tr2<i32, Qux, GenericTerm<i32>> for Bar { LL | impl Tr2<i32, Qux, GenericTerm<i32>> for Bar {
| ~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~
error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied
--> $DIR/associated-types-eq-2.rs:76:6
|
LL | impl Tr3<N
| ^^^ expected 3 generic arguments
|
note: trait defined here, with 3 generic parameters: `N`, `T2`, `T3`
--> $DIR/associated-types-eq-2.rs:69:7
|
LL | trait Tr3<const N: i32, T2, T3> {
| ^^^ ------------ -- --
help: add missing generic arguments
|
LL | impl Tr3<N, T2, T3, N
| ++++++++++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:76:10 --> $DIR/associated-types-eq-2.rs:76:10
| |
@ -213,7 +196,6 @@ LL | impl Tr3<N
| __________^ | __________^
LL | | LL | |
LL | | LL | |
LL | |
LL | | = 42, T2 = Qux, T3 = usize> for Bar { LL | | = 42, T2 = Qux, T3 = usize> for Bar {
| |____^ associated item constraint not allowed here | |____^ associated item constraint not allowed here
| |
@ -223,7 +205,7 @@ LL | impl Tr3<42, T2 = Qux, T3 = usize> for Bar {
| ~~ | ~~
error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied
--> $DIR/associated-types-eq-2.rs:85:6 --> $DIR/associated-types-eq-2.rs:84:6
| |
LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux { LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
| ^^^ expected 3 generic arguments | ^^^ expected 3 generic arguments
@ -239,7 +221,7 @@ LL | impl Tr3<N, T2, T3, n = 42, T2 = Qux, T3 = usize> for Qux {
| ++++++++++ | ++++++++++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:85:10 --> $DIR/associated-types-eq-2.rs:84:10
| |
LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux { LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
| ^^^^^^ associated item constraint not allowed here | ^^^^^^ associated item constraint not allowed here
@ -249,24 +231,8 @@ help: consider removing this associated item binding
LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux { LL | impl Tr3<n = 42, T2 = Qux, T3 = usize> for Qux {
| ~~~~~~~ | ~~~~~~~
error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied
--> $DIR/associated-types-eq-2.rs:93:6
|
LL | impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar {
| ^^^ expected 3 generic arguments
|
note: trait defined here, with 3 generic parameters: `N`, `T2`, `T3`
--> $DIR/associated-types-eq-2.rs:69:7
|
LL | trait Tr3<const N: i32, T2, T3> {
| ^^^ ------------ -- --
help: add missing generic arguments
|
LL | impl Tr3<N, T2, T3, N = u32, T2 = Qux, T3 = usize> for Bar {
| ++++++++++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:93:10 --> $DIR/associated-types-eq-2.rs:92:10
| |
LL | impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar { LL | impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar {
| ^^^^^^^ associated item constraint not allowed here | ^^^^^^^ associated item constraint not allowed here
@ -277,7 +243,7 @@ LL | impl Tr3<N = u32, T2 = Qux, T3 = usize> for Bar {
| ~~~~~~~~ | ~~~~~~~~
error[E0107]: trait takes 3 generic arguments but 1 generic argument was supplied error[E0107]: trait takes 3 generic arguments but 1 generic argument was supplied
--> $DIR/associated-types-eq-2.rs:100:6 --> $DIR/associated-types-eq-2.rs:98:6
| |
LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar { LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar {
| ^^^ -- supplied 1 generic argument | ^^^ -- supplied 1 generic argument
@ -295,7 +261,7 @@ LL | impl Tr3<42, T2, T3, T2 = 42, T3 = usize> for Bar {
| ++++++++ | ++++++++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:100:14 --> $DIR/associated-types-eq-2.rs:98:14
| |
LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar { LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar {
| ^^^^^^^ associated item constraint not allowed here | ^^^^^^^ associated item constraint not allowed here
@ -306,7 +272,7 @@ LL | impl Tr3<42, T2 = 42, T3 = usize> for Bar {
| ~~~~~~~~~ | ~~~~~~~~~
error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied error[E0107]: trait takes 3 generic arguments but 0 generic arguments were supplied
--> $DIR/associated-types-eq-2.rs:108:6 --> $DIR/associated-types-eq-2.rs:106:6
| |
LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar { LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar {
| ^^^ expected 3 generic arguments | ^^^ expected 3 generic arguments
@ -322,7 +288,7 @@ LL | impl Tr3<N, T2, T3, X = 42, Y = Qux, Z = usize> for Bar {
| ++++++++++ | ++++++++++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:108:10 --> $DIR/associated-types-eq-2.rs:106:10
| |
LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar { LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar {
| ^^^^^^ associated item constraint not allowed here | ^^^^^^ associated item constraint not allowed here
@ -333,13 +299,13 @@ LL | impl Tr3<X = 42, Y = Qux, Z = usize> for Bar {
| ~~~~~~~ | ~~~~~~~
error[E0107]: struct takes 1 generic argument but 0 generic arguments were supplied error[E0107]: struct takes 1 generic argument but 0 generic arguments were supplied
--> $DIR/associated-types-eq-2.rs:119:13 --> $DIR/associated-types-eq-2.rs:117:13
| |
LL | impl<'a, T> St<'a , T = Qux> { LL | impl<'a, T> St<'a , T = Qux> {
| ^^ expected 1 generic argument | ^^ expected 1 generic argument
| |
note: struct defined here, with 1 generic parameter: `T` note: struct defined here, with 1 generic parameter: `T`
--> $DIR/associated-types-eq-2.rs:117:8 --> $DIR/associated-types-eq-2.rs:115:8
| |
LL | struct St<'a, T> { v: &'a T } LL | struct St<'a, T> { v: &'a T }
| ^^ - | ^^ -
@ -349,7 +315,7 @@ LL | impl<'a, T> St<'a, T , T = Qux> {
| +++ | +++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/associated-types-eq-2.rs:119:21 --> $DIR/associated-types-eq-2.rs:117:21
| |
LL | impl<'a, T> St<'a , T = Qux> { LL | impl<'a, T> St<'a , T = Qux> {
| ^^^^^^^ associated item constraint not allowed here | ^^^^^^^ associated item constraint not allowed here
@ -359,7 +325,7 @@ help: to use `Qux` as a generic argument specify it directly
LL | impl<'a, T> St<'a , Qux> { LL | impl<'a, T> St<'a , Qux> {
| ~~~ | ~~~
error: aborting due to 27 previous errors error: aborting due to 25 previous errors
Some errors have detailed explanations: E0046, E0107, E0229, E0658. Some errors have detailed explanations: E0046, E0107, E0229, E0658.
For more information about an error, try `rustc --explain E0046`. For more information about an error, try `rustc --explain E0046`.

View File

@ -12,6 +12,11 @@ error[E0229]: associated item constraints are not allowed here
| |
LL | impl Super1<'_, bar(): Send> for () {} LL | impl Super1<'_, bar(): Send> for () {}
| ^^^^^^^^^^^ associated item constraint not allowed here | ^^^^^^^^^^^ associated item constraint not allowed here
|
help: consider removing this associated item constraint
|
LL | impl Super1<'_, bar(): Send> for () {}
| ~~~~~~~~~~~~~
error[E0046]: not all trait items implemented, missing: `bar` error[E0046]: not all trait items implemented, missing: `bar`
--> $DIR/rtn-in-impl-signature.rs:10:1 --> $DIR/rtn-in-impl-signature.rs:10:1

View File

@ -7,8 +7,7 @@ struct Bar;
const T: usize = 42; const T: usize = 42;
impl Foo<N = 3> for Bar { impl Foo<N = 3> for Bar {
//~^ ERROR trait takes 1 generic argument but 0 generic arguments were supplied //~^ ERROR associated item constraints are not allowed here
//~| ERROR associated item constraints are not allowed here
//~| ERROR associated const equality is incomplete //~| ERROR associated const equality is incomplete
fn do_x(&self) -> [u8; 3] { fn do_x(&self) -> [u8; 3] {
[0u8; 3] [0u8; 3]

View File

@ -8,22 +8,6 @@ LL | impl Foo<N = 3> for Bar {
= help: add `#![feature(associated_const_equality)]` to the crate attributes to enable = help: add `#![feature(associated_const_equality)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied
--> $DIR/issue-89013-no-kw.rs:9:6
|
LL | impl Foo<N = 3> for Bar {
| ^^^ expected 1 generic argument
|
note: trait defined here, with 1 generic parameter: `N`
--> $DIR/issue-89013-no-kw.rs:1:7
|
LL | trait Foo<const N: usize> {
| ^^^ --------------
help: add missing generic argument
|
LL | impl Foo<N, N = 3> for Bar {
| ++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/issue-89013-no-kw.rs:9:10 --> $DIR/issue-89013-no-kw.rs:9:10
| |
@ -35,7 +19,7 @@ help: to use `3` as a generic argument specify it directly
LL | impl Foo<3> for Bar { LL | impl Foo<3> for Bar {
| ~ | ~
error: aborting due to 3 previous errors error: aborting due to 2 previous errors
Some errors have detailed explanations: E0107, E0229, E0658. Some errors have detailed explanations: E0229, E0658.
For more information about an error, try `rustc --explain E0107`. For more information about an error, try `rustc --explain E0229`.

View File

@ -8,7 +8,6 @@ const T: usize = 42;
impl Foo<N = const 3> for Bar { impl Foo<N = const 3> for Bar {
//~^ ERROR expected lifetime, type, or constant, found keyword `const` //~^ ERROR expected lifetime, type, or constant, found keyword `const`
//~| ERROR trait takes 1 generic
//~| ERROR associated item constraints are not allowed here //~| ERROR associated item constraints are not allowed here
//~| ERROR associated const equality is incomplete //~| ERROR associated const equality is incomplete
fn do_x(&self) -> [u8; 3] { fn do_x(&self) -> [u8; 3] {

View File

@ -20,22 +20,6 @@ LL | impl Foo<N = const 3> for Bar {
= help: add `#![feature(associated_const_equality)]` to the crate attributes to enable = help: add `#![feature(associated_const_equality)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied
--> $DIR/issue-89013.rs:9:6
|
LL | impl Foo<N = const 3> for Bar {
| ^^^ expected 1 generic argument
|
note: trait defined here, with 1 generic parameter: `N`
--> $DIR/issue-89013.rs:1:7
|
LL | trait Foo<const N: usize> {
| ^^^ --------------
help: add missing generic argument
|
LL | impl Foo<N, N = const 3> for Bar {
| ++
error[E0229]: associated item constraints are not allowed here error[E0229]: associated item constraints are not allowed here
--> $DIR/issue-89013.rs:9:10 --> $DIR/issue-89013.rs:9:10
| |
@ -47,7 +31,7 @@ help: to use `3` as a generic argument specify it directly
LL | impl Foo<3> for Bar { LL | impl Foo<3> for Bar {
| ~ | ~
error: aborting due to 4 previous errors error: aborting due to 3 previous errors
Some errors have detailed explanations: E0107, E0229, E0658. Some errors have detailed explanations: E0229, E0658.
For more information about an error, try `rustc --explain E0107`. For more information about an error, try `rustc --explain E0229`.

View File

@ -0,0 +1,33 @@
trait Foo<T> {}
impl Foo<T: Default> for String {}
//~^ ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
impl Foo<T: 'a + Default> for u8 {}
//~^ ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
//~| ERROR use of undeclared lifetime name `'a`
//~| HELP consider introducing lifetime `'a` here
impl<T> Foo<T: Default> for u16 {}
//~^ ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
impl<'a> Foo<T: 'a + Default> for u32 {}
//~^ ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
trait Bar<T, K> {}
impl Bar<T: Default, K: Default> for String {}
//~^ ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
impl<T> Bar<T, K: Default> for u8 {}
//~^ ERROR trait takes 2 generic arguments but 1 generic argument was supplied
//~| HELP add missing generic argument
//~| ERROR associated item constraints are not allowed here
//~| HELP declare the type parameter right after the `impl` keyword
fn main() {}

View File

@ -0,0 +1,96 @@
error[E0261]: use of undeclared lifetime name `'a`
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:7:13
|
LL | impl Foo<T: 'a + Default> for u8 {}
| - ^^ undeclared lifetime
| |
| help: consider introducing lifetime `'a` here: `<'a>`
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:3:10
|
LL | impl Foo<T: Default> for String {}
| ^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<T: Default> Foo<T> for String {}
| ++++++++++++ ~
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:7:10
|
LL | impl Foo<T: 'a + Default> for u8 {}
| ^^^^^^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<'a, T: 'a + Default> Foo<T> for u8 {}
| +++++++++++++++++++++ ~
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:13:13
|
LL | impl<T> Foo<T: Default> for u16 {}
| ^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<T, T: Default> Foo<T> for u16 {}
| ++++++++++++ ~
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:17:14
|
LL | impl<'a> Foo<T: 'a + Default> for u32 {}
| ^^^^^^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<'a, 'a, T: 'a + Default> Foo<T> for u32 {}
| +++++++++++++++++++++ ~
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:23:10
|
LL | impl Bar<T: Default, K: Default> for String {}
| ^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<T: Default> Bar<T, K: Default> for String {}
| ++++++++++++ ~
error[E0107]: trait takes 2 generic arguments but 1 generic argument was supplied
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:27:9
|
LL | impl<T> Bar<T, K: Default> for u8 {}
| ^^^ - supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: trait defined here, with 2 generic parameters: `T`, `K`
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:21:7
|
LL | trait Bar<T, K> {}
| ^^^ - -
help: add missing generic argument
|
LL | impl<T> Bar<T, K, K: Default> for u8 {}
| +++
error[E0229]: associated item constraints are not allowed here
--> $DIR/impl-block-params-declared-in-wrong-spot-issue-113073.rs:27:16
|
LL | impl<T> Bar<T, K: Default> for u8 {}
| ^^^^^^^^^^ associated item constraint not allowed here
|
help: declare the type parameter right after the `impl` keyword
|
LL | impl<T, K: Default> Bar<T, K> for u8 {}
| ++++++++++++ ~
error: aborting due to 8 previous errors
Some errors have detailed explanations: E0107, E0229, E0261.
For more information about an error, try `rustc --explain E0107`.