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, 4 insertions, 2 deletions

diff --git a/crates/gen_lsp_server/examples/02_gen_lsp_server_with_logging.rs b/crates/gen_lsp_server/examples/02_gen_lsp_server_with_logging.rs
index 27e4f1cbc..1a6174462 100644
--- a/crates/gen_lsp_server/examples/02_gen_lsp_server_with_logging.rs
+++ b/crates/gen_lsp_server/examples/02_gen_lsp_server_with_logging.rs
@@ -42,6 +42,8 @@
 //! {"jsonrpc": "2.0", "method": "exit", "params": null}

 //! ```

 

+use std::error::Error;

+

 use crossbeam_channel::{Sender, Receiver};

 use lsp_types::{

     ServerCapabilities, InitializeParams,

@@ -52,7 +54,7 @@ use gen_lsp_server::{
     run_server, stdio_transport, handle_shutdown, RawMessage, RawResponse, RawRequest,

 };

 

-fn main() -> Result<(), failure::Error> {

+fn main() -> Result<(), Box<dyn Error + Sync + Send>> {

     // Set up logging. Because `stdio_transport` gets a lock on stdout and stdin, we must have

     // our logging only write out to stderr.

     flexi_logger::Logger::with_str("info").start().unwrap();

@@ -75,7 +77,7 @@ fn main_loop(
     _params: InitializeParams,

     receiver: &Receiver<RawMessage>,

     sender: &Sender<RawMessage>,

-) -> Result<(), failure::Error> {

+) -> Result<(), Box<dyn Error + Sync + Send>> {

     info!("starting example main loop");

     for msg in receiver {

         info!("got msg: {:?}", msg);