diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-10 17:56:44 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-10 17:56:44 +0000 |
commit | e5df8c402847d5bedb8ebcb621aac46dbe215cdd (patch) | |
tree | 87f12e2619ac0074134b758ddcc1f6c1ccef863a /crates/ra_ide_db/src/lib.rs | |
parent | daf3609654b6e9b2ac2808a056c61438674a1dc9 (diff) | |
parent | 14094e44770559c13a1e8bdfcfb989d3bedd00d8 (diff) |
Merge #3551
3551: Move FeatureFlags r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_db/src/lib.rs')
-rw-r--r-- | crates/ra_ide_db/src/lib.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs index a105c7556..6bcccc848 100644 --- a/crates/ra_ide_db/src/lib.rs +++ b/crates/ra_ide_db/src/lib.rs | |||
@@ -5,7 +5,6 @@ | |||
5 | pub mod marks; | 5 | pub mod marks; |
6 | pub mod line_index; | 6 | pub mod line_index; |
7 | pub mod line_index_utils; | 7 | pub mod line_index_utils; |
8 | pub mod feature_flags; | ||
9 | pub mod symbol_index; | 8 | pub mod symbol_index; |
10 | pub mod change; | 9 | pub mod change; |
11 | pub mod defs; | 10 | pub mod defs; |
@@ -22,7 +21,7 @@ use ra_db::{ | |||
22 | }; | 21 | }; |
23 | use rustc_hash::FxHashMap; | 22 | use rustc_hash::FxHashMap; |
24 | 23 | ||
25 | use crate::{feature_flags::FeatureFlags, line_index::LineIndex, symbol_index::SymbolsDatabase}; | 24 | use crate::{line_index::LineIndex, symbol_index::SymbolsDatabase}; |
26 | 25 | ||
27 | #[salsa::database( | 26 | #[salsa::database( |
28 | ra_db::SourceDatabaseStorage, | 27 | ra_db::SourceDatabaseStorage, |
@@ -37,7 +36,6 @@ use crate::{feature_flags::FeatureFlags, line_index::LineIndex, symbol_index::Sy | |||
37 | #[derive(Debug)] | 36 | #[derive(Debug)] |
38 | pub struct RootDatabase { | 37 | pub struct RootDatabase { |
39 | runtime: salsa::Runtime<RootDatabase>, | 38 | runtime: salsa::Runtime<RootDatabase>, |
40 | pub feature_flags: Arc<FeatureFlags>, | ||
41 | pub(crate) debug_data: Arc<DebugData>, | 39 | pub(crate) debug_data: Arc<DebugData>, |
42 | pub last_gc: crate::wasm_shims::Instant, | 40 | pub last_gc: crate::wasm_shims::Instant, |
43 | pub last_gc_check: crate::wasm_shims::Instant, | 41 | pub last_gc_check: crate::wasm_shims::Instant, |
@@ -82,17 +80,16 @@ impl salsa::Database for RootDatabase { | |||
82 | 80 | ||
83 | impl Default for RootDatabase { | 81 | impl Default for RootDatabase { |
84 | fn default() -> RootDatabase { | 82 | fn default() -> RootDatabase { |
85 | RootDatabase::new(None, FeatureFlags::default()) | 83 | RootDatabase::new(None) |
86 | } | 84 | } |
87 | } | 85 | } |
88 | 86 | ||
89 | impl RootDatabase { | 87 | impl RootDatabase { |
90 | pub fn new(lru_capacity: Option<usize>, feature_flags: FeatureFlags) -> RootDatabase { | 88 | pub fn new(lru_capacity: Option<usize>) -> RootDatabase { |
91 | let mut db = RootDatabase { | 89 | let mut db = RootDatabase { |
92 | runtime: salsa::Runtime::default(), | 90 | runtime: salsa::Runtime::default(), |
93 | last_gc: crate::wasm_shims::Instant::now(), | 91 | last_gc: crate::wasm_shims::Instant::now(), |
94 | last_gc_check: crate::wasm_shims::Instant::now(), | 92 | last_gc_check: crate::wasm_shims::Instant::now(), |
95 | feature_flags: Arc::new(feature_flags), | ||
96 | debug_data: Default::default(), | 93 | debug_data: Default::default(), |
97 | }; | 94 | }; |
98 | db.set_crate_graph_with_durability(Default::default(), Durability::HIGH); | 95 | db.set_crate_graph_with_durability(Default::default(), Durability::HIGH); |
@@ -112,7 +109,6 @@ impl salsa::ParallelDatabase for RootDatabase { | |||
112 | runtime: self.runtime.snapshot(self), | 109 | runtime: self.runtime.snapshot(self), |
113 | last_gc: self.last_gc, | 110 | last_gc: self.last_gc, |
114 | last_gc_check: self.last_gc_check, | 111 | last_gc_check: self.last_gc_check, |
115 | feature_flags: Arc::clone(&self.feature_flags), | ||
116 | debug_data: Arc::clone(&self.debug_data), | 112 | debug_data: Arc::clone(&self.debug_data), |
117 | }) | 113 | }) |
118 | } | 114 | } |