diff options
| author | bors <bors@rust-lang.org> | 2024-04-03 02:13:07 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-03 02:13:07 +0000 | 
| commit | b688d53a1736c17e49328a706a90829a9937a91a (patch) | |
| tree | 6e0c24f050e861b05aef27b8f2c7ba4ff1b061d2 /compiler/rustc_trait_selection/src | |
| parent | 40f743da23d869c57556bca473c0d360f8528f94 (diff) | |
| parent | f756095571c949c3c6f3b18f26c58d9cee92651a (diff) | |
| download | rust-b688d53a1736c17e49328a706a90829a9937a91a.tar.gz rust-b688d53a1736c17e49328a706a90829a9937a91a.zip | |
Auto merge of #123396 - jhpratt:rollup-oa54mh1, r=jhpratt
Rollup of 5 pull requests Successful merges: - #122865 (Split hir ty lowerer's error reporting code in check functions to mod errors.) - #122935 (rename ptr::from_exposed_addr -> ptr::with_exposed_provenance) - #123182 (Avoid expanding to unstable internal method) - #123203 (Add `Context::ext`) - #123380 (Improve bootstrap comments) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/mod.rs | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/compiler/rustc_trait_selection/src/traits/mod.rs b/compiler/rustc_trait_selection/src/traits/mod.rs index c875d3da47e..3ab4872fffe 100644 --- a/compiler/rustc_trait_selection/src/traits/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/mod.rs @@ -65,7 +65,7 @@ pub use self::util::{ check_args_compatible, supertrait_def_ids, supertraits, transitive_bounds, transitive_bounds_that_define_assoc_item, SupertraitDefIds, }; -pub use self::util::{expand_trait_aliases, TraitAliasExpander}; +pub use self::util::{expand_trait_aliases, TraitAliasExpander, TraitAliasExpansionInfo}; pub use self::util::{get_vtable_index_of_object_method, impl_item_is_final, upcast_choices}; pub use self::util::{with_replaced_escaping_bound_vars, BoundVarReplacer, PlaceholderReplacer}; | 
