From f032eeb05f0b7d77e30cd6c5eea016cc5d649e3f Mon Sep 17 00:00:00 2001
From: Muhammad Mominul Huque <mominul2082@gmail.com>
Date: Sat, 15 Jun 2019 13:24:02 +0600
Subject: Get rid of failure: ra_batch ra_cli

---
 crates/ra_batch/src/lib.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'crates/ra_batch/src')

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 @@
 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 +13,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,
-- 
cgit v1.2.3


From ebb40c7f87d58fb74c8f3b4dfcb2704140599d65 Mon Sep 17 00:00:00 2001
From: Muhammad Mominul Huque <mominul2082@gmail.com>
Date: Sat, 15 Jun 2019 13:37:15 +0600
Subject: cargo format

---
 crates/ra_batch/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'crates/ra_batch/src')

diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index 35e783b14..96b32d9fe 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -2,7 +2,6 @@ mod vfs_filter;
 
 use std::{sync::Arc, path::Path, collections::HashSet, error::Error};
 
-
 use rustc_hash::FxHashMap;
 
 use ra_db::{
-- 
cgit v1.2.3