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/ty/method_resolution.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/ty/method_resolution.rs')
| -rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 7c3839388..c7fbcfd06 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
| @@ -75,7 +75,7 @@ impl CrateImplBlocks { | |||
| 75 | } | 75 | } |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | for child in module.children(db)? { | 78 | for child in module.children(db) { |
| 79 | self.collect_recursive(db, child)?; | 79 | self.collect_recursive(db, child)?; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| @@ -93,7 +93,7 @@ impl CrateImplBlocks { | |||
| 93 | source_root_id, | 93 | source_root_id, |
| 94 | impls: FxHashMap::default(), | 94 | impls: FxHashMap::default(), |
| 95 | }; | 95 | }; |
| 96 | if let Some(module) = krate.root_module(db)? { | 96 | if let Some(module) = krate.root_module(db) { |
| 97 | crate_impl_blocks.collect_recursive(db, module)?; | 97 | crate_impl_blocks.collect_recursive(db, module)?; |
| 98 | } | 98 | } |
| 99 | Ok(Arc::new(crate_impl_blocks)) | 99 | Ok(Arc::new(crate_impl_blocks)) |