From a931fb1ef633473e272bb3f9ba86968dd90f44a7 Mon Sep 17 00:00:00 2001
From: Muhammad Mominul Huque <mominul2082@gmail.com>
Date: Sat, 15 Jun 2019 01:03:17 +0600
Subject: Get rid of failure: gen_lsp_server

---
 crates/gen_lsp_server/src/lib.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'crates/gen_lsp_server/src/lib.rs')

diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs
index 1cd5a3a7c..7643dcacc 100644
--- a/crates/gen_lsp_server/src/lib.rs
+++ b/crates/gen_lsp_server/src/lib.rs
@@ -54,7 +54,7 @@
 //! }
 //! ```
 
-use failure::{bail, format_err};
+use std::error::Error;
 
 mod msg;
 mod stdio;
@@ -66,7 +66,7 @@ use lsp_types::{
     InitializeParams, InitializeResult, ServerCapabilities,
 };
 
-pub type Result<T> = ::std::result::Result<T, failure::Error>;
+pub type Result<T> = ::std::result::Result<T, Box<dyn Error + Send + Sync>>;
 pub use crate::{
     msg::{ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, RawResponseError},
     stdio::{stdio_transport, Threads},
@@ -92,8 +92,8 @@ pub fn run_server(
     match receiver.recv() {
         Ok(RawMessage::Notification(n)) => n
             .cast::<Exit>()
-            .map_err(|n| format_err!("unexpected notification during shutdown: {:?}", n))?,
-        m => bail!("unexpected message during shutdown: {:?}", m),
+            .map_err(|n| format!("unexpected notification during shutdown: {:?}", n))?,
+        m => Err(format!("unexpected message during shutdown: {:?}", m))?,
     }
     log::info!("lsp server shutdown complete");
     Ok(())
@@ -118,19 +118,19 @@ fn initialize(
 ) -> Result<InitializeParams> {
     let (id, params) = match receiver.recv() {
         Ok(RawMessage::Request(req)) => match req.cast::<Initialize>() {
-            Err(req) => bail!("expected initialize request, got {:?}", req),
+            Err(req) => Err(format!("expected initialize request, got {:?}", req))?,
             Ok(req) => req,
         },
-        msg => bail!("expected initialize request, got {:?}", msg),
+        msg => Err(format!("expected initialize request, got {:?}", msg))?,
     };
     let resp = RawResponse::ok::<Initialize>(id, &InitializeResult { capabilities: caps });
     sender.send(RawMessage::Response(resp)).unwrap();
     match receiver.recv() {
         Ok(RawMessage::Notification(n)) => {
             n.cast::<Initialized>()
-                .map_err(|_| format_err!("expected initialized notification"))?;
+                .map_err(|_| "expected initialized notification")?;
         }
-        _ => bail!("expected initialized notification"),
+        _ => Err(format!("expected initialized notification"))?,
     }
     Ok(params)
 }
-- 
cgit v1.2.3