diff options
author | Aleksey Kladov <[email protected]> | 2019-12-20 10:59:50 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-12-20 11:00:05 +0000 |
commit | 8fc20b65035d93bcc1b3a89127916bd165a8d938 (patch) | |
tree | 7e95963bb359eb6eeda8f6aba564fd3eaf7030d2 /crates/ra_hir_def/src/nameres/collector.rs | |
parent | 67c2aea182c375108ebb8b923f5679e4f7fef1df (diff) |
Rename ContainerId -> AssocContainerId
Diffstat (limited to 'crates/ra_hir_def/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 8bbf7ffa2..848959f7c 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -24,7 +24,7 @@ use crate::{ | |||
24 | }, | 24 | }, |
25 | path::{ModPath, PathKind}, | 25 | path::{ModPath, PathKind}, |
26 | per_ns::PerNs, | 26 | per_ns::PerNs, |
27 | AdtId, AstId, ConstLoc, ContainerId, EnumLoc, EnumVariantId, FunctionLoc, ImplLoc, Intern, | 27 | AdtId, AssocContainerId, AstId, ConstLoc, EnumLoc, EnumVariantId, FunctionLoc, ImplLoc, Intern, |
28 | LocalImportId, LocalModuleId, ModuleDefId, ModuleId, StaticLoc, StructLoc, TraitLoc, | 28 | LocalImportId, LocalModuleId, ModuleDefId, ModuleId, StaticLoc, StructLoc, TraitLoc, |
29 | TypeAliasLoc, UnionLoc, | 29 | TypeAliasLoc, UnionLoc, |
30 | }; | 30 | }; |
@@ -763,7 +763,7 @@ where | |||
763 | let def: PerNs = match def.kind { | 763 | let def: PerNs = match def.kind { |
764 | raw::DefKind::Function(ast_id) => { | 764 | raw::DefKind::Function(ast_id) => { |
765 | let def = FunctionLoc { | 765 | let def = FunctionLoc { |
766 | container: ContainerId::ModuleId(module), | 766 | container: AssocContainerId::ModuleId(module), |
767 | ast_id: AstId::new(self.file_id, ast_id), | 767 | ast_id: AstId::new(self.file_id, ast_id), |
768 | } | 768 | } |
769 | .intern(self.def_collector.db); | 769 | .intern(self.def_collector.db); |
@@ -787,7 +787,7 @@ where | |||
787 | } | 787 | } |
788 | raw::DefKind::Const(ast_id) => { | 788 | raw::DefKind::Const(ast_id) => { |
789 | let def = ConstLoc { | 789 | let def = ConstLoc { |
790 | container: ContainerId::ModuleId(module), | 790 | container: AssocContainerId::ModuleId(module), |
791 | ast_id: AstId::new(self.file_id, ast_id), | 791 | ast_id: AstId::new(self.file_id, ast_id), |
792 | } | 792 | } |
793 | .intern(self.def_collector.db); | 793 | .intern(self.def_collector.db); |
@@ -808,7 +808,7 @@ where | |||
808 | } | 808 | } |
809 | raw::DefKind::TypeAlias(ast_id) => { | 809 | raw::DefKind::TypeAlias(ast_id) => { |
810 | let def = TypeAliasLoc { | 810 | let def = TypeAliasLoc { |
811 | container: ContainerId::ModuleId(module), | 811 | container: AssocContainerId::ModuleId(module), |
812 | ast_id: AstId::new(self.file_id, ast_id), | 812 | ast_id: AstId::new(self.file_id, ast_id), |
813 | } | 813 | } |
814 | .intern(self.def_collector.db); | 814 | .intern(self.def_collector.db); |