diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-29 23:24:17 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-29 23:24:17 +0100 |
commit | 913eff5ad73ffc95e9b48b4905b9d823e74017d6 (patch) | |
tree | 3f05c054c5c143862b9abde47bda2cd4fab2ded9 /crates/ra_hir_ty/src/lib.rs | |
parent | 4ff3573e18114e044ed74e785f099a023ebfbf5d (diff) | |
parent | 0cd6a88cf6f80d48669c6136f5fa814fcdafe8e2 (diff) |
Merge #4162
4162: Complete assoc. items on type parameters r=jonas-schievink a=jonas-schievink
This is fairly messy and seems to leak a lot through the `ra_hir` abstraction (`TypeNs`, `AssocItemId`, ...), so I'd be glad for any advise for how to improve this.
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/lib.rs')
-rw-r--r-- | crates/ra_hir_ty/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs index a8ef32ec5..a6f56c661 100644 --- a/crates/ra_hir_ty/src/lib.rs +++ b/crates/ra_hir_ty/src/lib.rs | |||
@@ -66,7 +66,8 @@ pub use autoderef::autoderef; | |||
66 | pub use infer::{InferTy, InferenceResult}; | 66 | pub use infer::{InferTy, InferenceResult}; |
67 | pub use lower::CallableDef; | 67 | pub use lower::CallableDef; |
68 | pub use lower::{ | 68 | pub use lower::{ |
69 | callable_item_sig, ImplTraitLoweringMode, TyDefId, TyLoweringContext, ValueTyDefId, | 69 | associated_type_shorthand_candidates, callable_item_sig, ImplTraitLoweringMode, TyDefId, |
70 | TyLoweringContext, ValueTyDefId, | ||
70 | }; | 71 | }; |
71 | pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; | 72 | pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; |
72 | 73 | ||