Skip to content

Commit a3e7f64

Browse files
estebankestebank
committed
On type mismatch involving associated type, suggest constraint
When an associated type is found when a specific type was expected, if possible provide a structured suggestion constraining the associated type in a bound. ``` error[E0271]: type mismatch resolving `<T as Foo>::Y == i32` --> $DIR/associated-types-multiple-types-one-trait.rs:13:5 | LL | want_y(t); | ^^^^^^ expected `i32`, found associated type ... LL | fn want_y<T:Foo<Y=i32>>(t: &T) { } | ----- required by this bound in `want_y` | = note: expected type `i32` found associated type `<T as Foo>::Y` help: consider constraining the associated type `<T as Foo>::Y` to `i32` | LL | fn have_x_want_y<T:Foo<X=u32, Y = i32>>(t: &T) | ^^^^^^^^^ ``` ``` error[E0308]: mismatched types --> $DIR/trait-with-missing-associated-type-restriction.rs:12:9 | LL | qux(x.func()) | ^^^^^^^^ expected `usize`, found associated type | = note: expected type `usize` found associated type `<impl Trait as Trait>::A` help: consider constraining the associated type `<impl Trait as Trait>::A` to `usize` | LL | fn foo(x: impl Trait<A = usize>) { | ^^^^^^^^^^ ```
1 parent edc0258 commit a3e7f64

22 files changed

+469
-66
lines changed

‎src/librustc_middle/ty/error.rs

+134-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_ast::ast;
33
use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
44
use rustc_hir as hir;
55
use rustc_hir::def_id::DefId;
6-
use rustc_span::Span;
6+
use rustc_span::{BytePos, Span};
77
use rustc_target::spec::abi;
88

99
use std::borrow::Cow;
@@ -392,7 +392,10 @@ impl<'tcx> TyCtxt<'tcx> {
392392
(ty::Param(_), ty::Projection(_)) | (ty::Projection(_), ty::Param(_)) => {
393393
db.note("you might be missing a type parameter or trait bound");
394394
}
395-
(ty::Param(p), _) | (_, ty::Param(p)) => {
395+
(ty::Param(p), ty::Dynamic(..))
396+
| (ty::Dynamic(..), ty::Param(p))
397+
| (ty::Param(p), ty::Opaque(..))
398+
| (ty::Opaque(..), ty::Param(p)) => {
396399
let generics = self.generics_of(body_owner_def_id);
397400
let p_span = self.def_span(generics.type_param(p, self).def_id);
398401
if !sp.contains(p_span) {
@@ -432,11 +435,18 @@ impl<T> Trait<T> for X {
432435
#traits-as-parameters",
433436
);
434437
}
438+
(ty::Param(p), _) | (_, ty::Param(p)) => {
439+
let generics = self.generics_of(body_owner_def_id);
440+
let p_span = self.def_span(generics.type_param(p, self).def_id);
441+
if !sp.contains(p_span) {
442+
db.span_label(p_span, "this type parameter");
443+
}
444+
}
435445
(ty::Projection(_), _) => {
436446
db.note(&format!(
437447
"consider constraining the associated type `{}` to `{}` or calling a \
438-
method that returns `{}`",
439-
values.expected, values.found, values.expected,
448+
method that returns `{0}`",
449+
values.expected, values.found,
440450
));
441451
if self.sess.teach(&db.get_code().unwrap()) {
442452
db.help(
@@ -461,15 +471,18 @@ impl Trait for X {
461471
https://doc.rust-lang.org/book/ch19-03-advanced-traits.html",
462472
);
463473
}
464-
(_, ty::Projection(_)) => {
465-
db.note(&format!(
474+
(_, ty::Projection(proj_ty)) => {
475+
let msg = format!(
466476
"consider constraining the associated type `{}` to `{}`",
467477
values.found, values.expected,
468-
));
469-
db.note(
470-
"for more information, visit \
471-
https://doc.rust-lang.org/book/ch19-03-advanced-traits.html",
472478
);
479+
if !self.suggest_constraint(db, &msg, body_owner_def_id, proj_ty, values) {
480+
db.help(&msg);
481+
db.note(
482+
"for more information, visit \
483+
https://doc.rust-lang.org/book/ch19-03-advanced-traits.html",
484+
);
485+
}
473486
}
474487
_ => {}
475488
}
@@ -492,4 +505,115 @@ impl Trait for X {
492505
_ => {}
493506
}
494507
}
508+
509+
fn suggest_constraint(
510+
&self,
511+
db: &mut DiagnosticBuilder<'_>,
512+
msg: &str,
513+
body_owner_def_id: DefId,
514+
proj_ty: &ty::ProjectionTy<'tcx>,
515+
values: &ExpectedFound<Ty<'tcx>>,
516+
) -> bool {
517+
let assoc = self.associated_item(proj_ty.item_def_id);
518+
let trait_ref = proj_ty.trait_ref(*self);
519+
if let Some(item) = self.hir().get_if_local(body_owner_def_id) {
520+
if let Some(hir_generics) = item.generics() {
521+
// Get the `DefId` for the type parameter corresponding to `A` in `<A as T>::Foo`.
522+
// This will also work for `impl Trait`.
523+
let def_id = if let ty::Param(param_ty) = proj_ty.self_ty().kind {
524+
let generics = self.generics_of(body_owner_def_id);
525+
generics.type_param(&param_ty, *self).def_id
526+
} else {
527+
return false;
528+
};
529+
530+
// First look in the `where` clause, as this might be
531+
// `fn foo<T>(x: T) where T: Trait`.
532+
for predicate in hir_generics.where_clause.predicates {
533+
if let hir::WherePredicate::BoundPredicate(pred) = predicate {
534+
if let hir::TyKind::Path(hir::QPath::Resolved(None, path)) =
535+
pred.bounded_ty.kind
536+
{
537+
if path.res.opt_def_id() == Some(def_id) {
538+
// This predicate is binding type param `A` in `<A as T>::Foo` to
539+
// something, potentially `T`.
540+
} else {
541+
continue;
542+
}
543+
} else {
544+
continue;
545+
}
546+
547+
if self.constrain_associated_type_structured_suggestion(
548+
db,
549+
&trait_ref,
550+
pred.bounds,
551+
&assoc,
552+
values,
553+
msg,
554+
) {
555+
return true;
556+
}
557+
}
558+
}
559+
for param in hir_generics.params {
560+
if self.hir().opt_local_def_id(param.hir_id).map(|id| id.to_def_id())
561+
== Some(def_id)
562+
{
563+
// This is type param `A` in `<A as T>::Foo`.
564+
return self.constrain_associated_type_structured_suggestion(
565+
db,
566+
&trait_ref,
567+
param.bounds,
568+
&assoc,
569+
values,
570+
msg,
571+
);
572+
}
573+
}
574+
}
575+
}
576+
false
577+
}
578+
579+
fn constrain_associated_type_structured_suggestion(
580+
&self,
581+
db: &mut DiagnosticBuilder<'_>,
582+
trait_ref: &ty::TraitRef<'tcx>,
583+
bounds: hir::GenericBounds<'_>,
584+
assoc: &ty::AssocItem,
585+
values: &ExpectedFound<Ty<'tcx>>,
586+
msg: &str,
587+
) -> bool {
588+
for bound in bounds {
589+
match bound {
590+
hir::GenericBound::Trait(ptr, hir::TraitBoundModifier::None) => {
591+
// Relate the type param against `T` in `<A as T>::Foo`.
592+
if ptr.trait_ref.trait_def_id() == Some(trait_ref.def_id) {
593+
if let Ok(has_params) = self
594+
.sess
595+
.source_map()
596+
.span_to_snippet(ptr.span)
597+
.map(|snippet| snippet.ends_with('>'))
598+
{
599+
let (span, sugg) = if has_params {
600+
let pos = ptr.span.hi() - BytePos(1);
601+
let span = Span::new(pos, pos, ptr.span.ctxt());
602+
(span, format!(", {} = {}", assoc.ident, values.expected))
603+
} else {
604+
(
605+
ptr.span.shrink_to_hi(),
606+
format!("<{} = {}>", assoc.ident, values.expected),
607+
)
608+
};
609+
db.span_suggestion(span, msg, sugg, Applicability::MaybeIncorrect);
610+
return true;
611+
}
612+
}
613+
}
614+
_ => {}
615+
}
616+
}
617+
false
618+
}
495619
}

‎src/test/ui/associated-types/associated-types-eq-3.stderr

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ LL | let _: Bar = x.boo();
88
|
99
= note: expected struct `Bar`
1010
found associated type `<I as Foo>::A`
11-
= note: consider constraining the associated type `<I as Foo>::A` to `Bar`
12-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
11+
help: consider constraining the associated type `<I as Foo>::A` to `Bar`
12+
|
13+
LL | fn foo2<I: Foo<A = Bar>>(x: I) {
14+
| ^^^^^^^^^
1315

1416
error[E0271]: type mismatch resolving `<isize as Foo>::A == Bar`
1517
--> $DIR/associated-types-eq-3.rs:38:5

‎src/test/ui/associated-types/associated-types-issue-20346.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ LL | is_iterator_of::<Option<T>, _>(&adapter);
1212
|
1313
= note: expected enum `std::option::Option<T>`
1414
found type `T`
15-
= help: type parameters must be constrained to match other types
16-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
1715

1816
error: aborting due to previous error
1917

‎src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr

+8-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ LL | fn want_y<T:Foo<Y=i32>>(t: &T) { }
99
|
1010
= note: expected type `i32`
1111
found associated type `<T as Foo>::Y`
12-
= note: consider constraining the associated type `<T as Foo>::Y` to `i32`
13-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
12+
help: consider constraining the associated type `<T as Foo>::Y` to `i32`
13+
|
14+
LL | fn have_x_want_y<T:Foo<X=u32, Y = i32>>(t: &T)
15+
| ^^^^^^^^^
1416

1517
error[E0271]: type mismatch resolving `<T as Foo>::X == u32`
1618
--> $DIR/associated-types-multiple-types-one-trait.rs:18:5
@@ -23,8 +25,10 @@ LL | fn want_x<T:Foo<X=u32>>(t: &T) { }
2325
|
2426
= note: expected type `u32`
2527
found associated type `<T as Foo>::X`
26-
= note: consider constraining the associated type `<T as Foo>::X` to `u32`
27-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
28+
help: consider constraining the associated type `<T as Foo>::X` to `u32`
29+
|
30+
LL | fn have_y_want_x<T:Foo<Y=i32, X = u32>>(t: &T)
31+
| ^^^^^^^^^
2832

2933
error: aborting due to 2 previous errors
3034

‎src/test/ui/generic-associated-types/iterable.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | type Item;
1313
|
1414
= note: expected reference `&T`
1515
found associated type `<std::vec::Vec<T> as Iterable>::Item<'_>`
16-
= note: consider constraining the associated type `<std::vec::Vec<T> as Iterable>::Item<'_>` to `&_`
16+
= help: consider constraining the associated type `<std::vec::Vec<T> as Iterable>::Item<'_>` to `&_`
1717
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
1818

1919
error[E0271]: type mismatch resolving `for<'a> <<[T] as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <[T] as Iterable>::Item<'a>`
@@ -31,7 +31,7 @@ LL | type Item;
3131
|
3232
= note: expected reference `&T`
3333
found associated type `<[T] as Iterable>::Item<'_>`
34-
= note: consider constraining the associated type `<[T] as Iterable>::Item<'_>` to `&_`
34+
= help: consider constraining the associated type `<[T] as Iterable>::Item<'_>` to `&_`
3535
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
3636

3737
error[E0271]: type mismatch resolving `for<'a> <<std::vec::Vec<T> as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <std::vec::Vec<T> as Iterable>::Item<'a>`

‎src/test/ui/hrtb/issue-62203-hrtb-ice.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let v = Unit2.m(
66
|
77
= note: expected struct `Unit4`
88
found associated type `<_ as Ty<'_>>::V`
9-
= note: consider constraining the associated type `<_ as Ty<'_>>::V` to `Unit4`
9+
= help: consider constraining the associated type `<_ as Ty<'_>>::V` to `Unit4`
1010
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
1111

1212
error[E0271]: type mismatch resolving `<[closure@$DIR/issue-62203-hrtb-ice.rs:42:17: 42:39] as std::ops::FnOnce<((&u8,),)>>::Output == Unit3`

‎src/test/ui/impl-trait/bound-normalization-fail.stderr

+8-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ LL | fn foo_fail<T: Trait>() -> impl FooLike<Output=T::Assoc> {
1414
|
1515
= note: expected type `()`
1616
found associated type `<T as impl_trait::Trait>::Assoc`
17-
= note: consider constraining the associated type `<T as impl_trait::Trait>::Assoc` to `()`
18-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
1917
= note: the return type of a function must have a statically known size
18+
help: consider constraining the associated type `<T as impl_trait::Trait>::Assoc` to `()`
19+
|
20+
LL | fn foo_fail<T: Trait<Assoc = ()>>() -> impl FooLike<Output=T::Assoc> {
21+
| ^^^^^^^^^^^^
2022

2123
error: `impl Trait` return type cannot contain a projection or `Self` that references lifetimes from a parent scope
2224
--> $DIR/bound-normalization-fail.rs:43:41
@@ -32,9 +34,11 @@ LL | fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output=T::Assoc> {
3234
|
3335
= note: expected type `()`
3436
found associated type `<T as lifetimes::Trait<'static>>::Assoc`
35-
= note: consider constraining the associated type `<T as lifetimes::Trait<'static>>::Assoc` to `()`
36-
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
3737
= note: the return type of a function must have a statically known size
38+
help: consider constraining the associated type `<T as lifetimes::Trait<'static>>::Assoc` to `()`
39+
|
40+
LL | fn foo2_fail<'a, T: Trait<'a, Assoc = ()>>() -> impl FooLike<Output=T::Assoc> {
41+
| ^^^^^^^^^^^^
3842

3943
error: aborting due to 3 previous errors; 1 warning emitted
4044

‎src/test/ui/impl-trait/equality2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ LL | let _: i32 = Leak::leak(hide(0_i32));
2525
|
2626
= note: expected type `i32`
2727
found associated type `<impl Foo as Leak>::T`
28-
= note: consider constraining the associated type `<impl Foo as Leak>::T` to `i32`
28+
= help: consider constraining the associated type `<impl Foo as Leak>::T` to `i32`
2929
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
3030

3131
error[E0308]: mismatched types

‎src/test/ui/impl-trait/universal-mismatched-type.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ LL | x
1010
|
1111
= note: expected struct `std::string::String`
1212
found type parameter `impl Debug`
13-
= help: type parameters must be constrained to match other types
14-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
1513

1614
error: aborting due to previous error
1715

‎src/test/ui/issues/issue-13853.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ LL | self.iter()
99
|
1010
= note: expected type parameter `I`
1111
found struct `std::slice::Iter<'_, N>`
12-
= help: type parameters must be constrained to match other types
13-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
1412

1513
error[E0599]: no method named `iter` found for reference `&G` in the current scope
1614
--> $DIR/issue-13853.rs:27:23

‎src/test/ui/issues/issue-20225.stderr

-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ LL | extern "rust-call" fn call(&self, (_,): (T,)) {}
88
|
99
= note: expected fn pointer `extern "rust-call" fn(&Foo, (&'a T,))`
1010
found fn pointer `extern "rust-call" fn(&Foo, (T,))`
11-
= help: type parameters must be constrained to match other types
12-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
1311

1412
error[E0053]: method `call_mut` has an incompatible type for trait
1513
--> $DIR/issue-20225.rs:11:3
@@ -21,8 +19,6 @@ LL | extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {}
2119
|
2220
= note: expected fn pointer `extern "rust-call" fn(&mut Foo, (&'a T,))`
2321
found fn pointer `extern "rust-call" fn(&mut Foo, (T,))`
24-
= help: type parameters must be constrained to match other types
25-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
2622

2723
error[E0053]: method `call_once` has an incompatible type for trait
2824
--> $DIR/issue-20225.rs:18:3
@@ -35,8 +31,6 @@ LL | extern "rust-call" fn call_once(self, (_,): (T,)) {}
3531
|
3632
= note: expected fn pointer `extern "rust-call" fn(Foo, (&'a T,))`
3733
found fn pointer `extern "rust-call" fn(Foo, (T,))`
38-
= help: type parameters must be constrained to match other types
39-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
4034

4135
error: aborting due to 3 previous errors
4236

‎src/test/ui/issues/issue-69306.stderr

-12
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ LL | const C: S0<u8> = Self(0);
88
|
99
= note: expected type parameter `T`
1010
found type `{integer}`
11-
= help: type parameters must be constrained to match other types
12-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
1311

1412
error[E0308]: mismatched types
1513
--> $DIR/issue-69306.rs:5:23
@@ -21,8 +19,6 @@ LL | const C: S0<u8> = Self(0);
2119
|
2220
= note: expected struct `S0<u8>`
2321
found struct `S0<T>`
24-
= help: type parameters must be constrained to match other types
25-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
2622

2723
error[E0308]: mismatched types
2824
--> $DIR/issue-69306.rs:10:14
@@ -35,8 +31,6 @@ LL | Self(0);
3531
|
3632
= note: expected type parameter `T`
3733
found type `{integer}`
38-
= help: type parameters must be constrained to match other types
39-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
4034

4135
error[E0308]: mismatched types
4236
--> $DIR/issue-69306.rs:27:14
@@ -49,8 +43,6 @@ LL | Self(0);
4943
|
5044
= note: expected type parameter `T`
5145
found type `{integer}`
52-
= help: type parameters must be constrained to match other types
53-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
5446

5547
error[E0308]: mismatched types
5648
--> $DIR/issue-69306.rs:33:32
@@ -62,8 +54,6 @@ LL | const C: S1<u8, u8> = Self(0, 1);
6254
|
6355
= note: expected type parameter `T`
6456
found type `{integer}`
65-
= help: type parameters must be constrained to match other types
66-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
6757

6858
error[E0308]: mismatched types
6959
--> $DIR/issue-69306.rs:33:27
@@ -75,8 +65,6 @@ LL | const C: S1<u8, u8> = Self(0, 1);
7565
|
7666
= note: expected struct `S1<u8, _>`
7767
found struct `S1<T, _>`
78-
= help: type parameters must be constrained to match other types
79-
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
8068

8169
error[E0308]: mismatched types
8270
--> $DIR/issue-69306.rs:41:14

0 commit comments

Comments
 (0)