diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-15 10:45:55 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-15 10:45:55 +0100 |
commit | 257a15b93942a1e38e561576af471a6a1e63bcff (patch) | |
tree | 3586eda54dab85be6d24325e597a1d8f060e36b7 /crates/ra_batch/src/lib.rs | |
parent | 9dbf985df5515f4b9b40a7dcf74f916fa8d57ee3 (diff) | |
parent | 408e173bb9737f9484ca773ee57cc791f5c57e16 (diff) |
Merge #1404
1404: Fight down failures! r=matklad a=mominul
issue #1400
Now only `ra_tools` crate depends on `failure`, should I also fight those? :grin:
Co-authored-by: Muhammad Mominul Huque <[email protected]>
Diffstat (limited to 'crates/ra_batch/src/lib.rs')
-rw-r--r-- | crates/ra_batch/src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index c59821f44..96b32d9fe 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -1,8 +1,6 @@ | |||
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; | ||
5 | use std::collections::HashSet; | ||
6 | 4 | ||
7 | use rustc_hash::FxHashMap; | 5 | use rustc_hash::FxHashMap; |
8 | 6 | ||
@@ -14,7 +12,7 @@ use ra_project_model::ProjectWorkspace; | |||
14 | use ra_vfs::{Vfs, VfsChange}; | 12 | use ra_vfs::{Vfs, VfsChange}; |
15 | use vfs_filter::IncludeRustFiles; | 13 | use vfs_filter::IncludeRustFiles; |
16 | 14 | ||
17 | type Result<T> = std::result::Result<T, failure::Error>; | 15 | type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; |
18 | 16 | ||
19 | #[salsa::database( | 17 | #[salsa::database( |
20 | ra_db::SourceDatabaseStorage, | 18 | ra_db::SourceDatabaseStorage, |