diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:20:31 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:20:31 +0000 |
| commit | 323938dae58576f5fa86ddebf88fdcb5b09662ed (patch) | |
| tree | dfeae99da99f6f9b2d91d31f84c0a3b527cfffbe /crates/ra_ide_api/src/goto_definition.rs | |
| parent | 72a4951023f11adfdf0eac353c99d8a01a9471fc (diff) | |
| parent | fafcd103d26821a8408572514201a40765bb2d2b (diff) | |
Merge #555
555: remove Cancelable from ids r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/goto_definition.rs')
| -rw-r--r-- | crates/ra_ide_api/src/goto_definition.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs index 5d522181b..cdd8e211d 100644 --- a/crates/ra_ide_api/src/goto_definition.rs +++ b/crates/ra_ide_api/src/goto_definition.rs | |||
| @@ -85,7 +85,7 @@ pub(crate) fn reference_definition( | |||
| 85 | .find_map(ast::Path::cast) | 85 | .find_map(ast::Path::cast) |
| 86 | .and_then(hir::Path::from_ast) | 86 | .and_then(hir::Path::from_ast) |
| 87 | { | 87 | { |
| 88 | let resolved = module.resolve_path(db, &path)?; | 88 | let resolved = module.resolve_path(db, &path); |
| 89 | if let Some(def_id) = resolved.take_types().or(resolved.take_values()) { | 89 | if let Some(def_id) = resolved.take_types().or(resolved.take_values()) { |
| 90 | if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)) { | 90 | if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)) { |
| 91 | return Ok(Exact(target)); | 91 | return Ok(Exact(target)); |