From 05ba45c667454028c3e65769d6f63fb0f27c1ca8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 15 Jan 2019 21:02:42 +0300 Subject: remove Canceled from API impl --- crates/ra_ide_api/src/parent_module.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide_api/src/parent_module.rs') diff --git a/crates/ra_ide_api/src/parent_module.rs b/crates/ra_ide_api/src/parent_module.rs index 379b3f3a4..e94297fe3 100644 --- a/crates/ra_ide_api/src/parent_module.rs +++ b/crates/ra_ide_api/src/parent_module.rs @@ -1,19 +1,16 @@ -use ra_db::{Cancelable, FilePosition}; +use ra_db::FilePosition; use crate::{NavigationTarget, db::RootDatabase}; /// This returns `Vec` because a module may be included from several places. We /// don't handle this case yet though, so the Vec has length at most one. -pub(crate) fn parent_module( - db: &RootDatabase, - position: FilePosition, -) -> Cancelable> { +pub(crate) fn parent_module(db: &RootDatabase, position: FilePosition) -> Vec { let module = match hir::source_binder::module_from_position(db, position) { - None => return Ok(Vec::new()), + None => return Vec::new(), Some(it) => it, }; let nav = NavigationTarget::from_module_to_decl(db, module); - Ok(vec![nav]) + vec![nav] } #[cfg(test)] -- cgit v1.2.3