Merge #553

553: remove Cancelable from fn_scopes r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 3607969ed..54eece165 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -1205,8 +1205,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
 pub fn infer(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<InferenceResult>> {
     db.check_canceled();
     let function = Function::new(def_id); // TODO: consts also need inference
-    let body = function.body(db)?;
-    let scopes = db.fn_scopes(def_id)?;
+    let body = function.body(db);
+    let scopes = db.fn_scopes(def_id);
     let module = function.module(db)?;
     let impl_block = function.impl_block(db)?;
     let mut ctx = InferenceContext::new(db, body, scopes, module, impl_block);