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

Move ids to hir_def crate

Browse source
This commit is contained in:
Aleksey Kladov 2019-10-30 13:10:38 +03:00
parent a136cc0653
commit c9cd6aa370
18 changed files with 258 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_ide_api/src/completion/complete_path.rs
View file

@ -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 {

4
crates/ra_ide_api/src/impls.rs
View file

@ -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(

5
crates/ra_ide_api/src/parent_module.rs
View file

@ -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()]
}

2
crates/ra_ide_api/src/references/search_scope.rs
View file

@ -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);