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/from_source.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/from_source.rs')
-rw-r--r-- | crates/ra_hir/src/from_source.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs index 7954c04b2..93713bb14 100644 --- a/crates/ra_hir/src/from_source.rs +++ b/crates/ra_hir/src/from_source.rs | |||
@@ -195,7 +195,7 @@ impl Module { | |||
195 | .find_map(|krate| { | 195 | .find_map(|krate| { |
196 | let def_map = db.crate_def_map(krate); | 196 | let def_map = db.crate_def_map(krate); |
197 | let module_id = def_map.find_module_by_source(src.file_id, decl_id)?; | 197 | let module_id = def_map.find_module_by_source(src.file_id, decl_id)?; |
198 | Some(Module { krate, module_id }) | 198 | Some(Module::new(krate, module_id)) |
199 | }) | 199 | }) |
200 | } | 200 | } |
201 | } | 201 | } |
@@ -208,6 +208,6 @@ where | |||
208 | let module_src = | 208 | let module_src = |
209 | crate::ModuleSource::from_child_node(db, src.file_id.original_file(db), &src.ast.syntax()); | 209 | crate::ModuleSource::from_child_node(db, src.file_id.original_file(db), &src.ast.syntax()); |
210 | let module = Module::from_definition(db, Source { file_id: src.file_id, ast: module_src })?; | 210 | let module = Module::from_definition(db, Source { file_id: src.file_id, ast: module_src })?; |
211 | let ctx = LocationCtx::new(db, module, src.file_id); | 211 | let ctx = LocationCtx::new(db, module.id, src.file_id); |
212 | Some(DEF::from_ast(ctx, &src.ast)) | 212 | Some(DEF::from_ast(ctx, &src.ast)) |
213 | } | 213 | } |