language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove Cancelable from navigation target

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-15 18:50:16 +03:00
parent 9dd4099d93
commit f1367e0370
11 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_ide_api/src/goto_definition.rs
View file

@ -70,7 +70,7 @@ pub(crate) fn reference_definition(
.node_expr(expr)
.and_then(|it| infer_result.method_resolution(it))
{
if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)?)? {
if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)) {
return Ok(Exact(target));
}
};
@ -87,7 +87,7 @@ pub(crate) fn reference_definition(
{
let resolved = module.resolve_path(db, &path)?;
if let Some(def_id) = resolved.take_types().or(resolved.take_values()) {
if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)?)? {
if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)) {
return Ok(Exact(target));
}
}
@ -112,7 +112,7 @@ fn name_definition(
if let Some(child_module) =
hir::source_binder::module_from_declaration(db, file_id, module)
{
let nav = NavigationTarget::from_module(db, child_module)?;
let nav = NavigationTarget::from_module(db, child_module);
return Ok(Some(vec![nav]));
}
}