From fafcd103d26821a8408572514201a40765bb2d2b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 15 Jan 2019 19:18:52 +0300 Subject: remove Cancelable from ids --- crates/ra_hir/src/code_model_impl/function.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'crates/ra_hir/src/code_model_impl/function.rs') diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs index d34803e32..66d7e1713 100644 --- a/crates/ra_hir/src/code_model_impl/function.rs +++ b/crates/ra_hir/src/code_model_impl/function.rs @@ -2,7 +2,6 @@ mod scope; use std::sync::Arc; -use ra_db::Cancelable; use ra_syntax::{TreeArc, ast::{self, NameOwner}}; use crate::{ @@ -24,12 +23,12 @@ impl Function { db.body_hir(self.def_id) } - pub(crate) fn module(&self, db: &impl HirDatabase) -> Cancelable { + pub(crate) fn module(&self, db: &impl HirDatabase) -> Module { self.def_id.module(db) } /// The containing impl block, if this is a method. - pub(crate) fn impl_block(&self, db: &impl HirDatabase) -> Cancelable> { + pub(crate) fn impl_block(&self, db: &impl HirDatabase) -> Option { self.def_id.impl_block(db) } } -- cgit v1.2.3