diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:06:52 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:06:52 +0000 |
| commit | 72a4951023f11adfdf0eac353c99d8a01a9471fc (patch) | |
| tree | 8cca098650d989ea58e6bd4aafd44e5ff85fcee5 /crates/ra_hir/src/query_definitions.rs | |
| parent | 7c977a7dcd2bac3b6148f2428bcb586c6354d775 (diff) | |
| parent | 18e9a710cd2f2ced84fde19e88d0b967dcb5939e (diff) | |
Merge #553
553: remove Cancelable from fn_scopes r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/query_definitions.rs')
| -rw-r--r-- | crates/ra_hir/src/query_definitions.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index 7ff942f6a..8f33ec707 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs | |||
| @@ -18,10 +18,10 @@ use crate::{ | |||
| 18 | nameres::{InputModuleItems, ItemMap, Resolver}, | 18 | nameres::{InputModuleItems, ItemMap, Resolver}, |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<FnScopes>> { | 21 | pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Arc<FnScopes> { |
| 22 | let body = db.body_hir(def_id)?; | 22 | let body = db.body_hir(def_id); |
| 23 | let res = FnScopes::new(body); | 23 | let res = FnScopes::new(body); |
| 24 | Ok(Arc::new(res)) | 24 | Arc::new(res) |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | pub(super) fn file_items(db: &impl HirDatabase, file_id: HirFileId) -> Arc<SourceFileItems> { | 27 | pub(super) fn file_items(db: &impl HirDatabase, file_id: HirFileId) -> Arc<SourceFileItems> { |