Skip to content

Commit 93974cb

Browse files
committed
Fix associated existentials for generic traits
1 parent 9130efd commit 93974cb

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

src/librustc/traits/project.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,8 @@ fn confirm_impl_candidate<'cx, 'gcx, 'tcx>(
15171517
}
15181518
let substs = translate_substs(selcx.infcx(), param_env, impl_def_id, substs, assoc_ty.node);
15191519
let ty = if let ty::AssociatedKind::Existential = assoc_ty.item.kind {
1520-
tcx.mk_anon(assoc_ty.item.def_id, substs)
1520+
let item_substs = Substs::identity_for_item(tcx, assoc_ty.item.def_id);
1521+
tcx.mk_anon(assoc_ty.item.def_id, item_substs)
15211522
} else {
15221523
tcx.type_of(assoc_ty.item.def_id)
15231524
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(existential_type)]
12+
// compile-pass
13+
14+
trait Bar {}
15+
struct Dummy<U>(U);
16+
impl<V> Bar for Dummy<V> {}
17+
18+
trait Foo<T> {
19+
type Assoc: Bar;
20+
fn foo(t: T) -> Self::Assoc;
21+
}
22+
23+
impl<W> Foo<W> for i32 {
24+
existential type Assoc: Bar;
25+
fn foo(w: W) -> Self::Assoc {
26+
Dummy(w)
27+
}
28+
}
29+
30+
struct NonGeneric;
31+
impl Bar for NonGeneric {}
32+
33+
impl<W> Foo<W> for u32 {
34+
existential type Assoc: Bar;
35+
fn foo(_: W) -> Self::Assoc {
36+
NonGeneric
37+
}
38+
}
39+
40+
fn main() {}

0 commit comments

Comments
 (0)