From c9cd6aa370667783292de3bc580e0503a409e453 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 30 Oct 2019 13:10:38 +0300
Subject: Move ids to hir_def crate
---
crates/ra_ide_api/src/completion/complete_path.rs | 2 +-
crates/ra_ide_api/src/impls.rs | 4 ++--
crates/ra_ide_api/src/parent_module.rs | 5 +----
crates/ra_ide_api/src/references/search_scope.rs | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
(limited to 'crates/ra_ide_api/src')
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index 23dece73c..956d8ce49 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -50,7 +50,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
hir::ModuleDef::TypeAlias(a) => a.ty(ctx.db),
_ => unreachable!(),
};
- let krate = ctx.module.and_then(|m| m.krate(ctx.db));
+ let krate = ctx.module.map(|m| m.krate());
if let Some(krate) = krate {
ty.iterate_impl_items(ctx.db, krate, |item| {
match item {
diff --git a/crates/ra_ide_api/src/impls.rs b/crates/ra_ide_api/src/impls.rs
index 7fc1b1efa..b899ed3a5 100644
--- a/crates/ra_ide_api/src/impls.rs
+++ b/crates/ra_ide_api/src/impls.rs
@@ -51,7 +51,7 @@ fn impls_for_def(
}
};
- let krate = module.krate(db)?;
+ let krate = module.krate();
let impls = db.impls_in_crate(krate);
Some(
@@ -72,7 +72,7 @@ fn impls_for_trait(
let src = hir::Source { file_id: position.file_id.into(), ast: node.clone() };
let tr = hir::Trait::from_source(db, src)?;
- let krate = module.krate(db)?;
+ let krate = module.krate();
let impls = db.impls_in_crate(krate);
Some(
diff --git a/crates/ra_ide_api/src/parent_module.rs b/crates/ra_ide_api/src/parent_module.rs
index 566509849..4c57566e2 100644
--- a/crates/ra_ide_api/src/parent_module.rs
+++ b/crates/ra_ide_api/src/parent_module.rs
@@ -27,10 +27,7 @@ pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> {
Some(it) => it,
None => return Vec::new(),
};
- let krate = match module.krate(db) {
- Some(it) => it,
- None => return Vec::new(),
- };
+ let krate = module.krate();
vec![krate.crate_id()]
}
diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
index b6eb248b7..dbd1af597 100644
--- a/crates/ra_ide_api/src/references/search_scope.rs
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -120,7 +120,7 @@ impl NameDefinition {
return SearchScope::new(res);
}
if vis.as_str() == "pub" {
- let krate = self.container.krate(db).unwrap();
+ let krate = self.container.krate();
let crate_graph = db.crate_graph();
for crate_id in crate_graph.iter() {
let mut crate_deps = crate_graph.dependencies(crate_id);
--
cgit v1.2.3