From 1bfb111cf9ab938a8795f1ad2089cdd8b8c4b7a5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 6 Feb 2020 12:35:40 +0100 Subject: [PATCH] Move change to ide-db --- crates/ra_ide/src/{ => ide_db}/change.rs | 6 +++--- crates/ra_ide/src/ide_db/mod.rs | 1 + crates/ra_ide/src/lib.rs | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) rename crates/ra_ide/src/{ => ide_db}/change.rs (99%) diff --git a/crates/ra_ide/src/change.rs b/crates/ra_ide/src/ide_db/change.rs similarity index 99% rename from crates/ra_ide/src/change.rs rename to crates/ra_ide/src/ide_db/change.rs index a0aeee1f781..62ffa6920db 100644 --- a/crates/ra_ide/src/change.rs +++ b/crates/ra_ide/src/ide_db/change.rs @@ -13,9 +13,9 @@ use ra_syntax::SourceFile; use rayon::prelude::*; use rustc_hash::FxHashMap; -use crate::{ - db::{DebugData, RootDatabase}, - ide_db::symbol_index::{SymbolIndex, SymbolsDatabase}, +use crate::ide_db::{ + symbol_index::{SymbolIndex, SymbolsDatabase}, + DebugData, RootDatabase, }; #[derive(Default)] diff --git a/crates/ra_ide/src/ide_db/mod.rs b/crates/ra_ide/src/ide_db/mod.rs index 924ee996870..0df4d510fa5 100644 --- a/crates/ra_ide/src/ide_db/mod.rs +++ b/crates/ra_ide/src/ide_db/mod.rs @@ -4,6 +4,7 @@ pub mod line_index; pub mod line_index_utils; pub mod feature_flags; pub mod symbol_index; +pub mod change; use std::sync::Arc; diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 109b5ad9f94..66f365cc361 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs @@ -14,7 +14,6 @@ mod ide_db; mod db; pub mod mock_analysis; -mod change; mod source_change; mod status; @@ -67,7 +66,6 @@ use crate::{ pub use crate::{ assists::{Assist, AssistId}, call_hierarchy::CallItem, - change::{AnalysisChange, LibraryData}, completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, diagnostics::Severity, display::{file_structure, FunctionSignature, NavigationTarget, StructureNode}, @@ -75,6 +73,7 @@ pub use crate::{ folding_ranges::{Fold, FoldKind}, hover::HoverResult, ide_db::{ + change::{AnalysisChange, LibraryData}, feature_flags::FeatureFlags, line_index::{LineCol, LineIndex}, line_index_utils::translate_offset_with_edit,