Skip to content

Commit 2784404

Browse files
fmeasefmease
committed
Implement consecutive shorthand projections
1 parent 56835d7 commit 2784404

17 files changed

+245
-49
lines changed

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
169169
pub(super) fn report_unresolved_assoc_item<I>(
170170
&self,
171171
all_candidates: impl Fn() -> I,
172-
qself: AssocItemQSelf,
172+
qself: AssocItemQSelf<'tcx>,
173173
assoc_tag: ty::AssocTag,
174174
assoc_ident: Ident,
175175
span: Span,

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,20 @@ pub trait HirTyLowerer<'tcx> {
224224
/// The "qualified self" of an associated item path.
225225
///
226226
/// For diagnostic purposes only.
227-
enum AssocItemQSelf {
227+
enum AssocItemQSelf<'tcx> {
228228
Trait(DefId),
229229
TyParam(LocalDefId, Span),
230230
SelfTyAlias,
231+
AssocTy(Ty<'tcx>),
231232
}
232233

233-
impl AssocItemQSelf {
234-
fn to_string(&self, tcx: TyCtxt<'_>) -> String {
234+
impl<'tcx> AssocItemQSelf<'tcx> {
235+
fn to_string(&self, tcx: TyCtxt<'tcx>) -> String {
235236
match *self {
236237
Self::Trait(def_id) => tcx.def_path_str(def_id),
237238
Self::TyParam(def_id, _) => tcx.hir_ty_param_name(def_id).to_string(),
238239
Self::SelfTyAlias => kw::SelfUpper.to_string(),
240+
Self::AssocTy(ty) => ty.to_string(),
239241
}
240242
}
241243
}
@@ -1034,7 +1036,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
10341036
fn probe_single_bound_for_assoc_item<I>(
10351037
&self,
10361038
all_candidates: impl Fn() -> I,
1037-
qself: AssocItemQSelf,
1039+
qself: AssocItemQSelf<'tcx>,
10381040
assoc_tag: ty::AssocTag,
10391041
assoc_ident: Ident,
10401042
span: Span,
@@ -1387,15 +1389,45 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
13871389
)?
13881390
}
13891391
(
1390-
&ty::Param(_),
1391-
Res::SelfTyParam { trait_: param_did } | Res::Def(DefKind::TyParam, param_did),
1392+
ty::Param(_),
1393+
Res::SelfTyParam { trait_: param_def_id }
1394+
| Res::Def(DefKind::TyParam, param_def_id),
13921395
) => self.probe_single_ty_param_bound_for_assoc_item(
1393-
param_did.expect_local(),
1396+
param_def_id.expect_local(),
13941397
hir_self_ty.span,
13951398
assoc_tag,
13961399
segment.ident,
13971400
span,
13981401
)?,
1402+
// FIXME(fmease):
1403+
// Require the pre-lowered projectee (the HIR QSelf) to have `DefKind::AssocTy`. Rephrased,
1404+
// `T::Assoc::Assoc` typeck'ing shouldn't imply `Identity<T::Assoc>::Assoc` typeck'ing where
1405+
// `Identity` is an eager (i.e., non-lazy) type alias. We should do this
1406+
// * for consistency with lazy type aliases (`ty::Weak`)
1407+
// * for consistency with the fact that `T::Assoc` typeck'ing doesn't imply `Identity<T>::Assoc`
1408+
// typeck'ing
1409+
(ty::Alias(ty::Projection, alias_ty), _ /* Res::Def(DefKind::AssocTy, _) */) => {
1410+
// FIXME: Utilizing `item_bounds` for this is cycle-prone.
1411+
let predicates = tcx.item_bounds(alias_ty.def_id).instantiate(tcx, alias_ty.args);
1412+
1413+
self.probe_single_bound_for_assoc_item(
1414+
|| {
1415+
let trait_refs = predicates.iter().filter_map(|pred| {
1416+
pred.as_trait_clause().map(|t| t.map_bound(|t| t.trait_ref))
1417+
});
1418+
traits::transitive_bounds_that_define_assoc_item(
1419+
tcx,
1420+
trait_refs,
1421+
segment.ident,
1422+
)
1423+
},
1424+
AssocItemQSelf::AssocTy(self_ty),
1425+
assoc_tag,
1426+
segment.ident,
1427+
span,
1428+
None,
1429+
)?
1430+
}
13991431
_ => {
14001432
return Err(self.report_unresolved_type_relative_path(
14011433
self_ty,

‎src/tools/tidy/src/issues.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,6 @@ ui/issues/issue-23024.rs
18181818
ui/issues/issue-23036.rs
18191819
ui/issues/issue-23041.rs
18201820
ui/issues/issue-23046.rs
1821-
ui/issues/issue-23073.rs
18221821
ui/issues/issue-2311-2.rs
18231822
ui/issues/issue-2311.rs
18241823
ui/issues/issue-2312.rs

‎tests/ui/associated-types/consecutive-shorthand-projections-ambiguous.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
trait ChooseMe {
2+
type Type;
3+
}
4+
5+
trait PickMe {
6+
type Type;
7+
}
8+
9+
trait HaveItAll {
10+
type See: ChooseMe + PickMe;
11+
}
12+
13+
struct Env<T: HaveItAll>(T::See::Type);
14+
//~^ ERROR ambiguous associated type `Type` in bounds of `<T as HaveItAll>::See`
15+
16+
fn main() {}

‎tests/ui/associated-types/consecutive-shorthand-projections-ambiguous.stderr‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
error[E0221]: ambiguous associated type `Type` in bounds of `<T as HaveItAll>::See`
2+
--> $DIR/consecutive-shorthand-projections-ambiguous.rs:13:26
3+
|
4+
LL | type Type;
5+
| --------- ambiguous `Type` from `ChooseMe`
6+
...
7+
LL | type Type;
8+
| --------- ambiguous `Type` from `PickMe`
9+
...
10+
LL | struct Env<T: HaveItAll>(T::See::Type);
11+
| ^^^^^^^^^^^^ ambiguous associated type `Type`
12+
|
13+
help: use fully-qualified syntax to disambiguate
14+
|
15+
LL - struct Env<T: HaveItAll>(T::See::Type);
16+
LL + struct Env<T: HaveItAll>(<<T as HaveItAll>::See as ChooseMe>::Type);
17+
|
18+
help: use fully-qualified syntax to disambiguate
19+
|
20+
LL - struct Env<T: HaveItAll>(T::See::Type);
21+
LL + struct Env<T: HaveItAll>(<<T as HaveItAll>::See as PickMe>::Type);
22+
|
23+
24+
error: aborting due to 1 previous error
25+
26+
For more information about this error, try `rustc --explain E0221`.

‎tests/ui/associated-types/consecutive-shorthand-projections-not-in-item-bounds.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// FIXME: Description
2+
3+
fn parametrized<T: Trait<Ty: Trait>>() {
4+
let _: T::Ty::Ty; //~ ERROR associated type `Ty` not found for `<T as Trait>::Ty`
5+
}
6+
7+
trait Trait {
8+
type Ty;
9+
}
10+
11+
fn main() {}

‎tests/ui/associated-types/consecutive-shorthand-projections-not-in-item-bounds.stderr‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0220]: associated type `Ty` not found for `<T as Trait>::Ty`
2+
--> $DIR/consecutive-shorthand-projections-not-in-item-bounds.rs:4:19
3+
|
4+
LL | let _: T::Ty::Ty;
5+
| ^^ there is an associated type `Ty` in the trait `Trait`
6+
7+
error: aborting due to 1 previous error
8+
9+
For more information about this error, try `rustc --explain E0220`.

‎tests/ui/associated-types/consecutive-shorthand-projections-struct-construction.rs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//@ check-pass
2+
3+
fn make<T: Indir0<Ty: Indir1<Ty = Struct>>>() {
4+
let _ = T::Ty::Ty { field: 0 };
5+
}
6+
7+
trait Indir0 {
8+
type Ty: Indir1;
9+
}
10+
11+
trait Indir1 {
12+
type Ty;
13+
}
14+
15+
struct Struct {
16+
field: i32
17+
}
18+
19+
fn main() {}

‎tests/ui/associated-types/consecutive-shorthand-projections.rs‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
//@ check-pass
2+
3+
fn factory0<T: Factory>() {
4+
let _: T::Output::Category;
5+
}
6+
7+
fn factory1<T: Factory<Output: Product<Category = u16>>>(category: u16) {
8+
let _: T::Output::Category = category;
9+
}
10+
11+
fn factory2<T: Factory>(_: T::Output::Category) {}
12+
13+
trait Factory {
14+
type Output: Product;
15+
}
16+
17+
impl Factory for () {
18+
type Output = u128;
19+
}
20+
21+
trait Product {
22+
type Category;
23+
}
24+
25+
impl Product for u128 {
26+
type Category = u16;
27+
}
28+
29+
/////////////////////////
30+
31+
fn chain<C: Chain<Link = C>>(chain: C) {
32+
let _: C::Link::Link::Link::Link::Link = chain;
33+
}
34+
35+
trait Chain { type Link: Chain; }
36+
37+
impl Chain for () {
38+
type Link = Self;
39+
}
40+
41+
/////////////////////////
42+
43+
fn scope<'r, T: Main<'static, (i32, U), 1>, U, const Q: usize>() {
44+
let _: T::Next<'r, (), Q>::Final;
45+
}
46+
47+
trait Main<'a, T, const N: usize> {
48+
type Next<'b, U, const M: usize>: Aux<'a, 'b, (T, U), N, M>;
49+
}
50+
51+
impl<'a, T, const N: usize> Main<'a, T, N> for () {
52+
type Next<'_b, _U, const _M: usize> = ();
53+
}
54+
55+
trait Aux<'a, 'b, T, const N: usize, const M: usize> {
56+
type Final;
57+
}
58+
59+
impl<'a, 'b, T, const N: usize, const M: usize> Aux<'a, 'b, T, N, M> for () {
60+
type Final = [[(T, &'a (), &'b ()); N]; M];
61+
}
62+
63+
/////////////////////////
64+
65+
fn main() {
66+
factory0::<()>();
67+
factory1::<()>(360);
68+
factory2::<()>(720);
69+
let _: <() as Factory>::Output::Category;
70+
71+
chain(());
72+
let _: <() as Chain>::Link::Link::Link;
73+
74+
scope::<(), bool, 32>();
75+
}

‎tests/ui/issues/issue-23073.rs‎ renamed to ‎tests/ui/associated-types/defaults-23073.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
//@ check-pass
2+
13
#![feature(associated_type_defaults)]
24

35
trait Foo { type T; }
6+
47
trait Bar {
58
type Foo: Foo;
6-
type FooT = <<Self as Bar>::Foo>::T; //~ ERROR ambiguous associated type
9+
type FooT = <<Self as Bar>::Foo>::T;
710
}
811

912
fn main() {}

0 commit comments

Comments
 (0)