diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-04 20:03:11 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-04 20:03:11 +0000 |
| commit | c08cff4fd67bf754897afa45c856f4b9025b9015 (patch) | |
| tree | e70984d904f5ce4d6a9719060c6ee7a46fe14637 /crates/ra_hir/src/code_model.rs | |
| parent | 9c93fbf346b351795c2e526f5ff7fa693aa50609 (diff) | |
| parent | 739babc39188c93eda82ce16a24680bbf2463fa1 (diff) | |
Merge #2176
2176: Move Namespace enum closer to usage r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
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 |