diff options
| author | Santiago Pastorino <spastorino@gmail.com> | 2020-12-02 12:19:38 -0300 |
|---|---|---|
| committer | Santiago Pastorino <spastorino@gmail.com> | 2020-12-02 12:19:38 -0300 |
| commit | 37354ebc9794b0eb14b08c02177e3094c8fe91cd (patch) | |
| tree | bc9a0e3278d1415afae16c30b375f4bae4f38e22 /compiler/rustc_trait_selection | |
| parent | b7ebc6b0c1ba3c27ebb17c0b496ece778ef11e18 (diff) | |
| download | rust-37354ebc9794b0eb14b08c02177e3094c8fe91cd.tar.gz rust-37354ebc9794b0eb14b08c02177e3094c8fe91cd.zip | |
Revert "Auto merge of #79209 - spastorino:trait-inheritance-self, r=nikomatsakis"
This reverts commit 349b3b324dade7ca638091db93ba08bbc443c63d, reversing changes made to b776d1c3e3db8befabb123ebb1e46c3531eaed46.
Diffstat (limited to 'compiler/rustc_trait_selection')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/mod.rs b/compiler/rustc_trait_selection/src/traits/mod.rs index d6048d092b1..2fb9b3cd5d3 100644 --- a/compiler/rustc_trait_selection/src/traits/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/mod.rs @@ -65,8 +65,7 @@ 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, transitive_bounds_that_define_assoc_type, - SupertraitDefIds, Supertraits, + supertrait_def_ids, supertraits, transitive_bounds, SupertraitDefIds, Supertraits, }; pub use self::chalk_fulfill::FulfillmentContext as ChalkFulfillmentContext; |