diff options
| author | bors <bors@rust-lang.org> | 2020-11-29 21:04:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-29 21:04:23 +0000 |
| commit | 349b3b324dade7ca638091db93ba08bbc443c63d (patch) | |
| tree | 8c862e923cedac14f624219d5d4e9be8d6009af5 /compiler/rustc_trait_selection | |
| parent | b776d1c3e3db8befabb123ebb1e46c3531eaed46 (diff) | |
| parent | ada7c1f4292400ca536ec1d65438e5e024ffac18 (diff) | |
| download | rust-349b3b324dade7ca638091db93ba08bbc443c63d.tar.gz rust-349b3b324dade7ca638091db93ba08bbc443c63d.zip | |
Auto merge of #79209 - spastorino:trait-inheritance-self, r=nikomatsakis
Allow Trait inheritance with cycles on associated types Fixes #35237 r? `@nikomatsakis` cc `@estebank`
Diffstat (limited to 'compiler/rustc_trait_selection')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/mod.rs b/compiler/rustc_trait_selection/src/traits/mod.rs index 2fb9b3cd5d3..d6048d092b1 100644 --- a/compiler/rustc_trait_selection/src/traits/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/mod.rs @@ -65,7 +65,8 @@ pub use self::util::{ get_vtable_index_of_object_method, impl_item_is_final, predicate_for_trait_def, upcast_choices, }; pub use self::util::{ - supertrait_def_ids, supertraits, transitive_bounds, SupertraitDefIds, Supertraits, + supertrait_def_ids, supertraits, transitive_bounds, transitive_bounds_that_define_assoc_type, + SupertraitDefIds, Supertraits, }; pub use self::chalk_fulfill::FulfillmentContext as ChalkFulfillmentContext; |