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]>

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 @@
 mod vfs_filter;
 
-use std::sync::Arc;
-use std::path::Path;
-use std::collections::HashSet;
+use std::{sync::Arc, path::Path, collections::HashSet, error::Error};
 
 use rustc_hash::FxHashMap;
 
@@ -14,7 +12,7 @@ use ra_project_model::ProjectWorkspace;
 use ra_vfs::{Vfs, VfsChange};
 use vfs_filter::IncludeRustFiles;
 
-type Result<T> = std::result::Result<T, failure::Error>;
+type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
 
 #[salsa::database(
     ra_db::SourceDatabaseStorage,