diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-30 10:14:18 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-30 10:14:18 +0000 |
commit | f996b6019bd2f388bd9994ea83f25487eb111560 (patch) | |
tree | 4662b1c76bed5e830c1dae9ee5dbf47520f41e1e /crates/ra_hir/src/impl_block.rs | |
parent | 8046f5b24a316a50e109fe484cde4c128293fa97 (diff) | |
parent | c9cd6aa370667783292de3bc580e0503a409e453 (diff) |
Merge #2126
2126: Move ids to hir_def crate r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/impl_block.rs')
-rw-r--r-- | crates/ra_hir/src/impl_block.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs index 1a5223680..06f21fc33 100644 --- a/crates/ra_hir/src/impl_block.rs +++ b/crates/ra_hir/src/impl_block.rs | |||
@@ -129,7 +129,7 @@ impl ImplData { | |||
129 | ) -> Self { | 129 | ) -> Self { |
130 | let target_trait = node.target_trait().map(TypeRef::from_ast); | 130 | let target_trait = node.target_trait().map(TypeRef::from_ast); |
131 | let target_type = TypeRef::from_ast_opt(node.target_type()); | 131 | let target_type = TypeRef::from_ast_opt(node.target_type()); |
132 | let ctx = LocationCtx::new(db, module, file_id); | 132 | let ctx = LocationCtx::new(db, module.id, file_id); |
133 | let negative = node.is_negative(); | 133 | let negative = node.is_negative(); |
134 | let items = if let Some(item_list) = node.item_list() { | 134 | let items = if let Some(item_list) = node.item_list() { |
135 | item_list | 135 | item_list |
@@ -182,7 +182,7 @@ impl ModuleImplBlocks { | |||
182 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>) { | 182 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>) { |
183 | let mut source_map = ImplSourceMap::default(); | 183 | let mut source_map = ImplSourceMap::default(); |
184 | let crate_graph = db.crate_graph(); | 184 | let crate_graph = db.crate_graph(); |
185 | let cfg_options = crate_graph.cfg_options(module.krate.crate_id()); | 185 | let cfg_options = crate_graph.cfg_options(module.id.krate); |
186 | 186 | ||
187 | let result = ModuleImplBlocks::collect(db, cfg_options, module, &mut source_map); | 187 | let result = ModuleImplBlocks::collect(db, cfg_options, module, &mut source_map); |
188 | (Arc::new(result), Arc::new(source_map)) | 188 | (Arc::new(result), Arc::new(source_map)) |