language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace some more ide usages of ModuleDef with Definition

Browse source
This commit is contained in:
Lukas Wirth 2021-11-11 18:20:54 +01:00
parent e42ff91f00
commit a510021065
4 changed files with 132 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ide_db/src/helpers.rs
View file

@ -10,7 +10,6 @@ pub mod rust_doc;
use std::{collections::VecDeque, iter};
use base_db::FileId;
use either::Either;
use hir::{ItemInNs, MacroDef, ModuleDef, Name, PathResolution, Semantics};
use itertools::Itertools;
use syntax::{
@ -19,7 +18,7 @@ use syntax::{
T,
};
use crate::RootDatabase;
use crate::{defs::Definition, RootDatabase};
pub use self::famous_defs::FamousDefs;
@ -122,7 +121,7 @@ pub fn mod_path_to_ast(path: &hir::ModPath) -> ast::Path {
pub fn visit_file_defs(
sema: &Semantics<RootDatabase>,
file_id: FileId,
cb: &mut dyn FnMut(Either<hir::ModuleDef, hir::Impl>),
cb: &mut dyn FnMut(Definition),
) {
let db = sema.db;
let module = match sema.to_module_def(file_id) {
@ -134,12 +133,12 @@ pub fn visit_file_defs(
if let ModuleDef::Module(submodule) = def {
if let hir::ModuleSource::Module(_) = submodule.definition_source(db).value {
defs.extend(submodule.declarations(db));
submodule.impl_defs(db).into_iter().for_each(|impl_| cb(Either::Right(impl_)));
submodule.impl_defs(db).into_iter().for_each(|impl_| cb(impl_.into()));
}
}
cb(Either::Left(def));
cb(def.into());
}
module.impl_defs(db).into_iter().for_each(|impl_| cb(Either::Right(impl_)));
module.impl_defs(db).into_iter().for_each(|impl_| cb(impl_.into()));
}
#[derive(Clone, Copy, Debug, PartialEq, Eq)]