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

remove Cancelable from source binders

Browse Source
This commit is contained in:
Aleksey Kladov
2019-01-15 18:13:11 +03:00
parent a36b2cf377
commit 11f3c8afb2
16 changed files with 68 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_hir/src/ids.rs
View File

@@ -163,7 +163,7 @@ impl DefId {
let loc = self.loc(db);
let res = match loc.kind {
DefKind::Module => {
let module = Module::from_module_id(db, loc.source_root_id, loc.module_id)?;
let module = Module::from_module_id(db, loc.source_root_id, loc.module_id);
Def::Module(module)
}
DefKind::Function => {
@@ -208,7 +208,11 @@ impl DefId {
/// For a module, returns that module; for any other def, returns the containing module.
pub fn module(self, db: &impl HirDatabase) -> Cancelable<Module> {
let loc = self.loc(db);
Module::from_module_id(db, loc.source_root_id, loc.module_id)
Ok(Module::from_module_id(
db,
loc.source_root_id,
loc.module_id,
))
}
/// Returns the containing crate.