From ec95152a4ec1ed617452c8578df128a117ab0b5d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 6 Feb 2020 12:18:52 +0100 Subject: [PATCH] Move FeatureFlags --- crates/ra_ide/src/{ => ide_db}/feature_flags.rs | 0 crates/ra_ide/src/ide_db/mod.rs | 4 ++-- crates/ra_ide/src/lib.rs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename crates/ra_ide/src/{ => ide_db}/feature_flags.rs (100%) diff --git a/crates/ra_ide/src/feature_flags.rs b/crates/ra_ide/src/ide_db/feature_flags.rs similarity index 100% rename from crates/ra_ide/src/feature_flags.rs rename to crates/ra_ide/src/ide_db/feature_flags.rs diff --git a/crates/ra_ide/src/ide_db/mod.rs b/crates/ra_ide/src/ide_db/mod.rs index cd47132ce81..834ad0135e8 100644 --- a/crates/ra_ide/src/ide_db/mod.rs +++ b/crates/ra_ide/src/ide_db/mod.rs @@ -2,6 +2,7 @@ pub mod line_index; pub mod line_index_utils; +pub mod feature_flags; use std::sync::Arc; @@ -13,9 +14,8 @@ use rustc_hash::FxHashMap; use crate::{ - ide_db::line_index::LineIndex, + ide_db::{feature_flags::FeatureFlags, line_index::LineIndex}, symbol_index::{self, SymbolsDatabase}, - FeatureFlags, }; #[salsa::database( diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 00d608269b1..003a5e52894 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs @@ -17,7 +17,6 @@ mod symbol_index; mod change; mod source_change; -mod feature_flags; mod status; mod completion; @@ -70,10 +69,10 @@ diagnostics::Severity, display::{file_structure, FunctionSignature, NavigationTarget, StructureNode}, expand_macro::ExpandedMacro, - feature_flags::FeatureFlags, folding_ranges::{Fold, FoldKind}, hover::HoverResult, ide_db::{ + feature_flags::FeatureFlags, line_index::{LineCol, LineIndex}, line_index_utils::translate_offset_with_edit, },