aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-06 11:18:52 +0000
committerAleksey Kladov <[email protected]>2020-02-06 11:18:52 +0000
commitec95152a4ec1ed617452c8578df128a117ab0b5d (patch)
tree6e0a0515fa22254d76ba19f345a5417b297c602e
parentee2ee1a8ff7ad13211d2f66d2f2f1daaf3a00bd9 (diff)
Move FeatureFlags
-rw-r--r--crates/ra_ide/src/ide_db/feature_flags.rs (renamed from crates/ra_ide/src/feature_flags.rs)0
-rw-r--r--crates/ra_ide/src/ide_db/mod.rs4
-rw-r--r--crates/ra_ide/src/lib.rs3
3 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_ide/src/feature_flags.rs b/crates/ra_ide/src/ide_db/feature_flags.rs
index 85617640d..85617640d 100644
--- a/crates/ra_ide/src/feature_flags.rs
+++ b/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 cd47132ce..834ad0135 100644
--- a/crates/ra_ide/src/ide_db/mod.rs
+++ b/crates/ra_ide/src/ide_db/mod.rs
@@ -2,6 +2,7 @@
2 2
3pub mod line_index; 3pub mod line_index;
4pub mod line_index_utils; 4pub mod line_index_utils;
5pub mod feature_flags;
5 6
6use std::sync::Arc; 7use std::sync::Arc;
7 8
@@ -13,9 +14,8 @@ use ra_db::{
13use rustc_hash::FxHashMap; 14use rustc_hash::FxHashMap;
14 15
15use crate::{ 16use crate::{
16 ide_db::line_index::LineIndex, 17 ide_db::{feature_flags::FeatureFlags, line_index::LineIndex},
17 symbol_index::{self, SymbolsDatabase}, 18 symbol_index::{self, SymbolsDatabase},
18 FeatureFlags,
19}; 19};
20 20
21#[salsa::database( 21#[salsa::database(
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 00d608269..003a5e528 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -17,7 +17,6 @@ pub mod mock_analysis;
17mod symbol_index; 17mod symbol_index;
18mod change; 18mod change;
19mod source_change; 19mod source_change;
20mod feature_flags;
21 20
22mod status; 21mod status;
23mod completion; 22mod completion;
@@ -70,10 +69,10 @@ pub use crate::{
70 diagnostics::Severity, 69 diagnostics::Severity,
71 display::{file_structure, FunctionSignature, NavigationTarget, StructureNode}, 70 display::{file_structure, FunctionSignature, NavigationTarget, StructureNode},
72 expand_macro::ExpandedMacro, 71 expand_macro::ExpandedMacro,
73 feature_flags::FeatureFlags,
74 folding_ranges::{Fold, FoldKind}, 72 folding_ranges::{Fold, FoldKind},
75 hover::HoverResult, 73 hover::HoverResult,
76 ide_db::{ 74 ide_db::{
75 feature_flags::FeatureFlags,
77 line_index::{LineCol, LineIndex}, 76 line_index::{LineCol, LineIndex},
78 line_index_utils::translate_offset_with_edit, 77 line_index_utils::translate_offset_with_edit,
79 }, 78 },