Skip to content

Commit b02f424

Browse files
fmeasefmease
committed
Implement consecutive shorthand projections
1 parent 11e5724 commit b02f424

17 files changed

+238
-43
lines changed

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

+35-3
Original file line numberDiff line numberDiff line change
@@ -1064,13 +1064,44 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
10641064
)?
10651065
}
10661066
(
1067-
&ty::Param(_),
1068-
Res::SelfTyParam { trait_: param_did } | Res::Def(DefKind::TyParam, param_did),
1067+
ty::Param(_),
1068+
Res::SelfTyParam { trait_: param_def_id }
1069+
| Res::Def(DefKind::TyParam, param_def_id),
10691070
) => self.probe_single_ty_param_bound_for_assoc_ty(
1070-
param_did.expect_local(),
1071+
param_def_id.expect_local(),
10711072
assoc_ident,
10721073
span,
10731074
)?,
1075+
// FIXME(fmease):
1076+
// Require the pre-lowered projectee (the HIR QSelf) to have `DefKind::AssocTy`. Rephrased,
1077+
// `T::Assoc::Assoc` typeck'ing shouldn't imply `Identity<T::Assoc>::Assoc` typeck'ing where
1078+
// `Identity` is an eager (i.e., non-lazy) type alias. We should do this
1079+
// * for consistency with lazy type aliases (`ty::Weak`)
1080+
// * for consistency with the fact that `T::Assoc` typeck'ing doesn't imply `Identity<T>::Assoc`
1081+
// typeck'ing
1082+
(ty::Alias(ty::Projection, alias_ty), _ /* Res::Def(DefKind::AssocTy, _) */) => {
1083+
// FIXME: Utilizing `item_bounds` for this is cycle-prone.
1084+
let predicates = tcx.item_bounds(alias_ty.def_id).instantiate(tcx, alias_ty.args);
1085+
1086+
self.probe_single_bound_for_assoc_item(
1087+
|| {
1088+
let trait_refs = predicates.iter().filter_map(|pred| {
1089+
pred.as_trait_clause().map(|t| t.map_bound(|t| t.trait_ref))
1090+
});
1091+
traits::transitive_bounds_that_define_assoc_item(
1092+
tcx,
1093+
trait_refs,
1094+
assoc_ident,
1095+
)
1096+
},
1097+
qself_ty,
1098+
None,
1099+
ty::AssocKind::Type,
1100+
assoc_ident,
1101+
span,
1102+
None,
1103+
)?
1104+
}
10741105
_ => {
10751106
let reported = if variant_resolution.is_some() {
10761107
// Variant in type position
@@ -1227,6 +1258,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
12271258
);
12281259
});
12291260
}
1261+
12301262
Ok((ty, DefKind::AssocTy, assoc_ty.def_id))
12311263
}
12321264

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

-1
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,6 @@ ui/issues/issue-23024.rs
18551855
ui/issues/issue-23036.rs
18561856
ui/issues/issue-23041.rs
18571857
ui/issues/issue-23046.rs
1858-
ui/issues/issue-23073.rs
18591858
ui/issues/issue-2311-2.rs
18601859
ui/issues/issue-2311.rs
18611860
ui/issues/issue-2312.rs

‎src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::path::{Path, PathBuf};
1616
const ENTRY_LIMIT: u32 = 901;
1717
// FIXME: The following limits should be reduced eventually.
1818

19-
const ISSUES_ENTRY_LIMIT: u32 = 1672;
19+
const ISSUES_ENTRY_LIMIT: u32 = 1670;
2020

2121
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2222
"rs", // test source files

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

+16
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

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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 as HaveItAll>::See as ChooseMe>::Type);
16+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17+
help: use fully-qualified syntax to disambiguate
18+
|
19+
LL | struct Env<T: HaveItAll>(<<T as HaveItAll>::See as PickMe>::Type);
20+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
21+
22+
error: aborting due to 1 previous error
23+
24+
For more information about this error, try `rustc --explain E0221`.

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

+11
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

+9
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

+19
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

+75
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

+4-1
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() {}

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

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0223]: ambiguous associated type
2+
--> $DIR/non-consecutive-shorthand-projections.rs:16:12
3+
|
4+
LL | let _: Identity<T::Project>::Project;
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
help: if there were a trait named `Example` with associated type `Project` implemented for `Identity<<T as Trait>::Project>`, you could use the fully-qualified path
8+
|
9+
LL | let _: <Identity<<T as Trait>::Project> as Example>::Project;
10+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11+
12+
error: aborting due to 1 previous error
13+
14+
For more information about this error, try `rustc --explain E0223`.

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

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// FIXME(fmease): Proper explainer.
2+
// Of course, under #22519 (arbitrary shorthand projections), this should obviously typeck.
3+
// For reference, `T::Alias` typeck'ing does *not* imply `Identity<T>::Alias` typeck'ing.
4+
//@ revisions: eager lazy
5+
//@[eager] check-pass
6+
#![cfg_attr(lazy, feature(lazy_type_alias), allow(incomplete_features))]
7+
8+
type Identity<T> = T;
9+
10+
trait Trait {
11+
type Project: Trait;
12+
}
13+
14+
fn scope<T: Trait>() {
15+
// FIXME(fmease): Reject this under [eager], too!
16+
let _: Identity<T::Project>::Project; //[lazy]~ ERROR ambiguous associated type
17+
}
18+
19+
fn main() {}

‎tests/ui/issues/issue-23073.stderr

-14
This file was deleted.

‎tests/ui/qualified/qualified-path-params-2.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Check that qualified paths with type parameters
22
// fail during type checking and not during parsing
3-
43
struct S;
54

65
trait Tr {
@@ -15,7 +14,6 @@ impl S {
1514
fn f<T>() {}
1615
}
1716

18-
type A = <S as Tr>::A::f<u8>;
19-
//~^ ERROR ambiguous associated type
17+
type A = <S as Tr>::A::f<u8>; //~ ERROR associated type `f` not found for `<S as Tr>::A`
2018

2119
fn main() {}

‎tests/ui/qualified/qualified-path-params-2.stderr

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
error[E0223]: ambiguous associated type
2-
--> $DIR/qualified-path-params-2.rs:18:10
1+
error[E0220]: associated type `f` not found for `<S as Tr>::A`
2+
--> $DIR/qualified-path-params-2.rs:17:24
33
|
44
LL | type A = <S as Tr>::A::f<u8>;
5-
| ^^^^^^^^^^^^^^^^^^^
6-
|
7-
help: if there were a trait named `Example` with associated type `f` implemented for `<S as Tr>::A`, you could use the fully-qualified path
8-
|
9-
LL | type A = <<S as Tr>::A as Example>::f;
10-
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5+
| ^ there is a similarly named associated type `A` in the trait `Tr`
116

127
error: aborting due to 1 previous error
138

14-
For more information about this error, try `rustc --explain E0223`.
9+
For more information about this error, try `rustc --explain E0220`.

‎tests/ui/ufcs/ufcs-partially-resolved.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn main() {
3333
<u8 as Tr>::N::NN; //~ ERROR cannot find associated type `N` in trait `Tr`
3434
<u8 as E>::N::NN; //~ ERROR expected trait, found enum `E`
3535
<u8 as A>::N::NN; //~ ERROR expected trait, found type alias `A`
36-
let _: <u8 as Tr>::Y::NN; //~ ERROR ambiguous associated type
36+
let _: <u8 as Tr>::Y::NN; //~ ERROR associated type `NN` not found for `<u8 as Tr>::Y`
3737
let _: <u8 as E>::Y::NN; //~ ERROR expected trait, found enum `E`
3838
<u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found for type `u16`
3939
<u8 as E>::Y::NN; //~ ERROR expected trait, found enum `E`

‎tests/ui/ufcs/ufcs-partially-resolved.stderr

+5-10
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,11 @@ LL | let _: <u8 as Dr>::Z::N;
245245
| |
246246
| help: an associated type with a similar name exists: `X`
247247

248-
error[E0223]: ambiguous associated type
249-
--> $DIR/ufcs-partially-resolved.rs:36:12
248+
error[E0220]: associated type `NN` not found for `<u8 as Tr>::Y`
249+
--> $DIR/ufcs-partially-resolved.rs:36:27
250250
|
251251
LL | let _: <u8 as Tr>::Y::NN;
252-
| ^^^^^^^^^^^^^^^^^
253-
|
254-
help: if there were a trait named `Example` with associated type `NN` implemented for `<u8 as Tr>::Y`, you could use the fully-qualified path
255-
|
256-
LL | let _: <<u8 as Tr>::Y as Example>::NN;
257-
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
252+
| ^^ associated type `NN` not found
258253

259254
error[E0599]: no associated item named `NN` found for type `u16` in the current scope
260255
--> $DIR/ufcs-partially-resolved.rs:38:20
@@ -270,5 +265,5 @@ LL | <u8 as Dr>::X::N;
270265

271266
error: aborting due to 32 previous errors
272267

273-
Some errors have detailed explanations: E0223, E0404, E0405, E0575, E0576, E0599.
274-
For more information about an error, try `rustc --explain E0223`.
268+
Some errors have detailed explanations: E0220, E0404, E0405, E0575, E0576, E0599.
269+
For more information about an error, try `rustc --explain E0220`.

0 commit comments

Comments
 (0)