diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
commit | 443ff27724855ffbfccad3513bb82d59e1a4f8ae (patch) | |
tree | 684cec39e4dd7856c4738a4635ac5bce814efcd0 /crates/ra_hir/src/ty.rs | |
parent | c7f072372edc7a94544c993d03928aab2ac92dab (diff) | |
parent | fedd320cf284ec5d489e62bf809277cedd9f60ac (diff) |
Merge #548
548: check_canceled does not return Result r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
-rw-r--r-- | crates/ra_hir/src/ty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 5579db8fb..03787bd89 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -1203,7 +1203,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | pub fn infer(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<InferenceResult>> { | 1205 | pub fn infer(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<InferenceResult>> { |
1206 | db.check_canceled()?; | 1206 | db.check_canceled(); |
1207 | let function = Function::new(def_id); // TODO: consts also need inference | 1207 | let function = Function::new(def_id); // TODO: consts also need inference |
1208 | let body = function.body(db)?; | 1208 | let body = function.body(db)?; |
1209 | let scopes = db.fn_scopes(def_id)?; | 1209 | let scopes = db.fn_scopes(def_id)?; |