diff options
author | Muhammad Mominul Huque <[email protected]> | 2019-06-15 08:24:02 +0100 |
---|---|---|
committer | Muhammad Mominul Huque <[email protected]> | 2019-06-15 08:24:02 +0100 |
commit | f032eeb05f0b7d77e30cd6c5eea016cc5d649e3f (patch) | |
tree | c186b6462d1b54a3a7e5ac73033611edb3db5ca9 /crates/ra_batch | |
parent | 9709bd39ca8a564d517372ee33304d34ac0b09bf (diff) |
Get rid of failure: ra_batch ra_cli
Diffstat (limited to 'crates/ra_batch')
-rw-r--r-- | crates/ra_batch/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_batch/src/lib.rs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml index 3037e27c4..8bf085bbf 100644 --- a/crates/ra_batch/Cargo.toml +++ b/crates/ra_batch/Cargo.toml | |||
@@ -8,8 +8,6 @@ authors = ["rust-analyzer developers"] | |||
8 | log = "0.4.5" | 8 | log = "0.4.5" |
9 | rustc-hash = "1.0" | 9 | rustc-hash = "1.0" |
10 | 10 | ||
11 | failure = "0.1.4" | ||
12 | |||
13 | ra_vfs = "0.2.0" | 11 | ra_vfs = "0.2.0" |
14 | ra_syntax = { path = "../ra_syntax" } | 12 | ra_syntax = { path = "../ra_syntax" } |
15 | ra_db = { path = "../ra_db" } | 13 | ra_db = { path = "../ra_db" } |
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index c59821f44..35e783b14 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -1,8 +1,7 @@ | |||
1 | mod vfs_filter; | 1 | mod vfs_filter; |
2 | 2 | ||
3 | use std::sync::Arc; | 3 | use std::{sync::Arc, path::Path, collections::HashSet, error::Error}; |
4 | use std::path::Path; | 4 | |
5 | use std::collections::HashSet; | ||
6 | 5 | ||
7 | use rustc_hash::FxHashMap; | 6 | use rustc_hash::FxHashMap; |
8 | 7 | ||
@@ -14,7 +13,7 @@ use ra_project_model::ProjectWorkspace; | |||
14 | use ra_vfs::{Vfs, VfsChange}; | 13 | use ra_vfs::{Vfs, VfsChange}; |
15 | use vfs_filter::IncludeRustFiles; | 14 | use vfs_filter::IncludeRustFiles; |
16 | 15 | ||
17 | type Result<T> = std::result::Result<T, failure::Error>; | 16 | type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; |
18 | 17 | ||
19 | #[salsa::database( | 18 | #[salsa::database( |
20 | ra_db::SourceDatabaseStorage, | 19 | ra_db::SourceDatabaseStorage, |