rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove Cancelable from Module API

Browse Source
This commit is contained in:
Aleksey Kladov
2019-01-15 18:26:29 +03:00
parent 91feed736f
commit ca52cf1ecd
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_ide_api/src/navigation_target.rs
View File

@@ -73,9 +73,9 @@ impl NavigationTarget {
db: &RootDatabase,
module: hir::Module,
) -> Cancelable<NavigationTarget> {
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<NavigationTarget> {
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,