nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

make deps cancelable

Browse Source
This commit is contained in:
Aleksey Kladov 2019-01-06 13:45:41 +03:00
parent 61687b9db6
commit b37fba7136
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_hir/src/code_model_api.rs
View File

@ -21,8 +21,8 @@ impl Crate {
pub fn crate_id(&self) -> CrateId {
self.crate_id
}
pub fn dependencies(&self, db: &impl HirDatabase) -> Vec<CrateDependency> {
self.dependencies_impl(db)
pub fn dependencies(&self, db: &impl HirDatabase) -> Cancelable<Vec<CrateDependency>> {
Ok(self.dependencies_impl(db))
}
pub fn root_module(&self, db: &impl HirDatabase) -> Cancelable<Option<Module>> {
self.root_module_impl(db)

2
crates/ra_hir/src/module/nameres.rs
View File

@ -344,7 +344,7 @@ where
if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file())
{
let krate = Crate::new(crate_id);
for dep in krate.dependencies(self.db) {
for dep in krate.dependencies(self.db)? {
if let Some(module) = dep.krate.root_module(self.db)? {
let def_id = module.def_id;
self.add_module_item(