From ca52cf1ecd4f65ff2a8c3953c35b006e73a60ea8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 15 Jan 2019 18:26:29 +0300 Subject: remove Cancelable from Module API --- crates/ra_ide_api/src/navigation_target.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_ide_api/src/navigation_target.rs') diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs index 230d0f67a..7562b9a1f 100644 --- a/crates/ra_ide_api/src/navigation_target.rs +++ b/crates/ra_ide_api/src/navigation_target.rs @@ -73,9 +73,9 @@ impl NavigationTarget { db: &RootDatabase, module: hir::Module, ) -> Cancelable { - let (file_id, source) = module.definition_source(db)?; + let (file_id, source) = module.definition_source(db); let name = module - .name(db)? + .name(db) .map(|it| it.to_string().into()) .unwrap_or_default(); let res = match source { @@ -94,10 +94,10 @@ impl NavigationTarget { module: hir::Module, ) -> Cancelable { let name = module - .name(db)? + .name(db) .map(|it| it.to_string().into()) .unwrap_or_default(); - if let Some((file_id, source)) = module.declaration_source(db)? { + if let Some((file_id, source)) = module.declaration_source(db) { return Ok(NavigationTarget::from_syntax( file_id, name, -- cgit v1.2.3