diff options
author | Aleksey Kladov <[email protected]> | 2018-11-04 11:09:21 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-11-04 11:09:21 +0000 |
commit | f29b0172fbcbc88160980c2e7359f92d7c0d885d (patch) | |
tree | 4ec1f709d283d3ea0b7c225a70f6439d67a5ca32 /crates/ra_analysis/src/db.rs | |
parent | cca5f862de8a4eb4a8990fdca95a4a7686937789 (diff) |
Use Default everywhere
Diffstat (limited to 'crates/ra_analysis/src/db.rs')
-rw-r--r-- | crates/ra_analysis/src/db.rs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 9548ec602..627512553 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs | |||
@@ -2,7 +2,7 @@ use std::sync::Arc; | |||
2 | 2 | ||
3 | use ra_editor::LineIndex; | 3 | use ra_editor::LineIndex; |
4 | use ra_syntax::{File, SyntaxNode}; | 4 | use ra_syntax::{File, SyntaxNode}; |
5 | use salsa; | 5 | use salsa::{self, Database}; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | db, | 8 | db, |
@@ -15,7 +15,7 @@ use crate::{ | |||
15 | Cancelable, Canceled, FileId, | 15 | Cancelable, Canceled, FileId, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | #[derive(Default, Debug)] | 18 | #[derive(Debug)] |
19 | pub(crate) struct RootDatabase { | 19 | pub(crate) struct RootDatabase { |
20 | runtime: salsa::Runtime<RootDatabase>, | 20 | runtime: salsa::Runtime<RootDatabase>, |
21 | } | 21 | } |
@@ -26,6 +26,21 @@ impl salsa::Database for RootDatabase { | |||
26 | } | 26 | } |
27 | } | 27 | } |
28 | 28 | ||
29 | impl Default for RootDatabase { | ||
30 | fn default() -> RootDatabase { | ||
31 | let mut db = RootDatabase { | ||
32 | runtime: Default::default(), | ||
33 | }; | ||
34 | db.query_mut(crate::input::SourceRootQuery) | ||
35 | .set(crate::input::WORKSPACE, Default::default()); | ||
36 | db.query_mut(crate::input::CrateGraphQuery) | ||
37 | .set((), Default::default()); | ||
38 | db.query_mut(crate::input::LibrariesQuery) | ||
39 | .set((), Default::default()); | ||
40 | db | ||
41 | } | ||
42 | } | ||
43 | |||
29 | pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> { | 44 | pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> { |
30 | if db.salsa_runtime().is_current_revision_canceled() { | 45 | if db.salsa_runtime().is_current_revision_canceled() { |
31 | Err(Canceled) | 46 | Err(Canceled) |