language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove Cancelable from nameres

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-15 19:15:01 +03:00
parent 18e9a710cd
commit 490112dea1
10 changed files with 52 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/ra_hir/src/code_model_impl/module.rs
View file

@ -114,18 +114,13 @@ impl Module {
}
/// Returns a `ModuleScope`: a set of items, visible in this module.
pub fn scope_impl(&self, db: &impl HirDatabase) -> Cancelable<ModuleScope> {
pub fn scope_impl(&self, db: &impl HirDatabase) -> ModuleScope {
let loc = self.def_id.loc(db);
let item_map = db.item_map(loc.source_root_id)?;
let res = item_map.per_module[&loc.module_id].clone();
Ok(res)
let item_map = db.item_map(loc.source_root_id);
item_map.per_module[&loc.module_id].clone()
}
pub fn resolve_path_impl(
&self,
db: &impl HirDatabase,
path: &Path,
) -> Cancelable<PerNs<DefId>> {
pub fn resolve_path_impl(&self, db: &impl HirDatabase, path: &Path) -> PerNs<DefId> {
let mut curr_per_ns = PerNs::types(
match path.kind {
PathKind::Crate => self.crate_root(db),
@ -134,7 +129,7 @@ impl Module {
if let Some(p) = self.parent(db) {
p
} else {
return Ok(PerNs::none());
return PerNs::none();
}
}
}
@ -146,7 +141,7 @@ impl Module {
let curr = if let Some(r) = curr_per_ns.as_ref().take_types() {
r
} else {
return Ok(PerNs::none());
return PerNs::none();
};
let module = match curr.resolve(db) {
Def::Module(it) => it,
@ -157,28 +152,28 @@ impl Module {
e.variants(db).into_iter().find(|(n, _variant)| n == name);
if let Some((_n, variant)) = matching_variant {
return Ok(PerNs::both(variant.def_id(), e.def_id()));
return PerNs::both(variant.def_id(), e.def_id());
} else {
return Ok(PerNs::none());
return PerNs::none();
}
} else if segments.len() == idx {
// enum
return Ok(PerNs::types(e.def_id()));
return PerNs::types(e.def_id());
} else {
// malformed enum?
return Ok(PerNs::none());
return PerNs::none();
}
}
_ => return Ok(PerNs::none()),
_ => return PerNs::none(),
};
let scope = module.scope(db)?;
let scope = module.scope(db);
curr_per_ns = if let Some(r) = scope.get(&name) {
r.def_id
} else {
return Ok(PerNs::none());
return PerNs::none();
};
}
Ok(curr_per_ns)
curr_per_ns
}
pub fn problems_impl(