diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:34:09 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:34:09 +0000 |
| commit | 05149d353299b54476410daeda6551e1261128ef (patch) | |
| tree | e757ea3f647159de8ce49e43177e10c43f61d2bf /crates/ra_hir/src/nameres.rs | |
| parent | 91feed736f91a3790b2f5a5d0d879c06843bce95 (diff) | |
| parent | 8af9a18660f9b2f34da902f43c1eef856af1cfca (diff) | |
Merge #551
551: remove Cancelable from Module API, part 2 r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
| -rw-r--r-- | crates/ra_hir/src/nameres.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index edb3b1e64..e51cbe786 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
| @@ -353,8 +353,8 @@ where | |||
| 353 | if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file()) | 353 | if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file()) |
| 354 | { | 354 | { |
| 355 | let krate = Crate::new(crate_id); | 355 | let krate = Crate::new(crate_id); |
| 356 | for dep in krate.dependencies(self.db)? { | 356 | for dep in krate.dependencies(self.db) { |
| 357 | if let Some(module) = dep.krate.root_module(self.db)? { | 357 | if let Some(module) = dep.krate.root_module(self.db) { |
| 358 | let def_id = module.def_id; | 358 | let def_id = module.def_id; |
| 359 | self.add_module_item( | 359 | self.add_module_item( |
| 360 | &mut module_items, | 360 | &mut module_items, |