diff options
author | Aleksey Kladov <[email protected]> | 2019-01-18 13:56:02 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-19 12:37:25 +0000 |
commit | 63f7dadc111b22301ba7df588d5c66a658d0a6da (patch) | |
tree | 01def0f3d562a2b3a112c6c5f9ea2a26d935abae /crates/ra_hir/src/nameres.rs | |
parent | c0aeb5204c010a11db2015113a7858b517415de1 (diff) |
rename LoweredImport -> ImportId
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index ab0a9041d..4efafd409 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -60,7 +60,7 @@ pub struct Resolution { | |||
60 | /// None for unresolved | 60 | /// None for unresolved |
61 | pub def_id: PerNs<DefId>, | 61 | pub def_id: PerNs<DefId>, |
62 | /// ident by whitch this is imported into local scope. | 62 | /// ident by whitch this is imported into local scope. |
63 | pub import: Option<LoweredImport>, | 63 | pub import: Option<ImportId>, |
64 | } | 64 | } |
65 | 65 | ||
66 | #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] | 66 | #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] |
@@ -154,7 +154,7 @@ pub(crate) struct Resolver<'a, DB> { | |||
154 | input: &'a FxHashMap<ModuleId, Arc<LoweredModule>>, | 154 | input: &'a FxHashMap<ModuleId, Arc<LoweredModule>>, |
155 | source_root: SourceRootId, | 155 | source_root: SourceRootId, |
156 | module_tree: Arc<ModuleTree>, | 156 | module_tree: Arc<ModuleTree>, |
157 | processed_imports: FxHashSet<(ModuleId, LoweredImport)>, | 157 | processed_imports: FxHashSet<(ModuleId, ImportId)>, |
158 | result: ItemMap, | 158 | result: ItemMap, |
159 | } | 159 | } |
160 | 160 | ||
@@ -296,7 +296,7 @@ where | |||
296 | fn resolve_import( | 296 | fn resolve_import( |
297 | &mut self, | 297 | &mut self, |
298 | module_id: ModuleId, | 298 | module_id: ModuleId, |
299 | import_id: LoweredImport, | 299 | import_id: ImportId, |
300 | import: &ImportData, | 300 | import: &ImportData, |
301 | ) -> bool { | 301 | ) -> bool { |
302 | log::debug!("resolving import: {:?}", import); | 302 | log::debug!("resolving import: {:?}", import); |