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

remove Cancelable from Module API, part 2

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-15 18:30:58 +03:00
parent ca52cf1ecd
commit c159e414b4
7 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide_api/src/imp.rs
View file

@ -99,16 +99,16 @@ impl db::RootDatabase {
impl db::RootDatabase {
/// Returns `Vec` for the same reason as `parent_module`
pub(crate) fn crate_for(&self, file_id: FileId) -> Cancelable<Vec<CrateId>> {
pub(crate) fn crate_for(&self, file_id: FileId) -> Vec<CrateId> {
let module = match source_binder::module_from_file_id(self, file_id) {
Some(it) => it,
None => return Ok(Vec::new()),
None => return Vec::new(),
};
let krate = match module.krate(self)? {
let krate = match module.krate(self) {
Some(it) => it,
None => return Ok(Vec::new()),
None => return Vec::new(),
};
Ok(vec![krate.crate_id()])
vec![krate.crate_id()]
}
pub(crate) fn find_all_refs(
&self,

2
crates/ra_ide_api/src/lib.rs
View file

@ -419,7 +419,7 @@ impl Analysis {
/// Returns crates this file belongs too.
pub fn crate_for(&self, file_id: FileId) -> Cancelable<Vec<CrateId>> {
self.with_db(|db| db.crate_for(file_id))?
self.with_db(|db| db.crate_for(file_id))
}
/// Returns the root file of the given crate.

1
crates/ra_ide_api/src/runnables.rs
View file

@ -80,7 +80,6 @@ fn runnable_mod(db: &RootDatabase, file_id: FileId, module: &ast::Module) -> Opt
// FIXME: thread cancellation instead of `.ok`ing
let path = module
.path_to_root(db)
.ok()?
.into_iter()
.rev()
.filter_map(|it| it.name(db))