diff options
author | Aleksey Kladov <[email protected]> | 2019-01-15 15:26:29 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-15 15:26:29 +0000 |
commit | ca52cf1ecd4f65ff2a8c3953c35b006e73a60ea8 (patch) | |
tree | 0cb202b9c3a670dee6667d7f636b01a71ae554c6 /crates/ra_ide_api/src/navigation_target.rs | |
parent | 91feed736f91a3790b2f5a5d0d879c06843bce95 (diff) |
remove Cancelable from Module API
Diffstat (limited to 'crates/ra_ide_api/src/navigation_target.rs')
-rw-r--r-- | crates/ra_ide_api/src/navigation_target.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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 { | |||
73 | db: &RootDatabase, | 73 | db: &RootDatabase, |
74 | module: hir::Module, | 74 | module: hir::Module, |
75 | ) -> Cancelable<NavigationTarget> { | 75 | ) -> Cancelable<NavigationTarget> { |
76 | let (file_id, source) = module.definition_source(db)?; | 76 | let (file_id, source) = module.definition_source(db); |
77 | let name = module | 77 | let name = module |
78 | .name(db)? | 78 | .name(db) |
79 | .map(|it| it.to_string().into()) | 79 | .map(|it| it.to_string().into()) |
80 | .unwrap_or_default(); | 80 | .unwrap_or_default(); |
81 | let res = match source { | 81 | let res = match source { |
@@ -94,10 +94,10 @@ impl NavigationTarget { | |||
94 | module: hir::Module, | 94 | module: hir::Module, |
95 | ) -> Cancelable<NavigationTarget> { | 95 | ) -> Cancelable<NavigationTarget> { |
96 | let name = module | 96 | let name = module |
97 | .name(db)? | 97 | .name(db) |
98 | .map(|it| it.to_string().into()) | 98 | .map(|it| it.to_string().into()) |
99 | .unwrap_or_default(); | 99 | .unwrap_or_default(); |
100 | if let Some((file_id, source)) = module.declaration_source(db)? { | 100 | if let Some((file_id, source)) = module.declaration_source(db) { |
101 | return Ok(NavigationTarget::from_syntax( | 101 | return Ok(NavigationTarget::from_syntax( |
102 | file_id, | 102 | file_id, |
103 | name, | 103 | name, |