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

Less abstract CrateData api

Browse Source
This commit is contained in:
Kirill Bulatov
2020-03-09 11:26:46 +02:00
parent 5cffef56e2
commit e1aa96f2c5
9 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/ra_hir/src/code_model.rs
View File

@@ -55,7 +55,9 @@ pub struct CrateDependency {
impl Crate {
pub fn dependencies(self, db: &impl DefDatabase) -> Vec<CrateDependency> {
db.crate_graph()
.dependencies(self.id)
.crate_data(&self.id)
.dependencies
.iter()
.map(|dep| {
let krate = Crate { id: dep.crate_id() };
let name = dep.as_name();
@@ -69,7 +71,9 @@ impl Crate {
let crate_graph = db.crate_graph();
crate_graph
.iter()
.filter(|&krate| crate_graph.dependencies(krate).any(|it| it.crate_id == self.id))
.filter(|&krate| {
crate_graph.crate_data(&krate).dependencies.iter().any(|it| it.crate_id == self.id)
})
.map(|id| Crate { id })
.collect()
}
@@ -80,12 +84,11 @@ impl Crate {
}
pub fn root_file(self, db: &impl DefDatabase) -> FileId {
db.crate_graph().crate_root(self.id)
db.crate_graph().crate_data(&self.id).root_file_id
}
pub fn edition(self, db: &impl DefDatabase) -> Edition {
let crate_graph = db.crate_graph();
crate_graph.edition(self.id)
db.crate_graph().crate_data(&self.id).edition
}
pub fn all(db: &impl DefDatabase) -> Vec<Crate> {