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/code_model.rs | |
| parent | c60f9bf4c6d6ddd341c673b228b6aa1add3da62b (diff) | |
| parent | 38f2bd21fbecf1c997a4ab9a8913e8b5487088e3 (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
| -rw-r--r-- | crates/ra_hir/src/code_model.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 181c5d47a..4e273d9e4 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
| @@ -30,8 +30,8 @@ use crate::{ | |||
| 30 | impl_block::ImplBlock, | 30 | impl_block::ImplBlock, |
| 31 | resolve::{Resolver, Scope, TypeNs}, | 31 | resolve::{Resolver, Scope, TypeNs}, |
| 32 | traits::TraitData, | 32 | traits::TraitData, |
| 33 | ty::{InferenceResult, TraitRef}, | 33 | ty::{InferenceResult, Namespace, TraitRef}, |
| 34 | Either, HasSource, Name, ScopeDef, Ty, {ImportId, Namespace}, | 34 | Either, HasSource, ImportId, Name, ScopeDef, Ty, |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | /// hir::Crate describes a single crate. It's the main interface with which | 37 | /// hir::Crate describes a single crate. It's the main interface with which |