diff options
| author | Seivan Heidari <[email protected]> | 2019-11-04 23:00:30 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-04 23:00:30 +0000 |
| commit | 8eb5148af7e7a87a685f7581809368b13eaa17ec (patch) | |
| tree | 7f0ac4da3fa6e487fe1692a041d4d1144fd3d8db /crates/ra_hir/src/ty.rs | |
| parent | c60f9bf4c6d6ddd341c673b228b6aa1add3da62b (diff) | |
| parent | 38f2bd21fbecf1c997a4ab9a8913e8b5487088e3 (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
| -rw-r--r-- | crates/ra_hir/src/ty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index d1a9d7411..cd2ac0e8b 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
| @@ -27,7 +27,7 @@ pub(crate) use infer::{infer_query, InferTy, InferenceResult}; | |||
| 27 | pub use lower::CallableDef; | 27 | pub use lower::CallableDef; |
| 28 | pub(crate) use lower::{ | 28 | pub(crate) use lower::{ |
| 29 | callable_item_sig, generic_defaults_query, generic_predicates_for_param_query, | 29 | callable_item_sig, generic_defaults_query, generic_predicates_for_param_query, |
| 30 | generic_predicates_query, type_for_def, type_for_field, TypableDef, | 30 | generic_predicates_query, type_for_def, type_for_field, Namespace, TypableDef, |
| 31 | }; | 31 | }; |
| 32 | pub(crate) use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; | 32 | pub(crate) use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; |
| 33 | 33 | ||