From f6e8b376d1d21b8b697de5ef1e35a341855202ed Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 6 Dec 2018 21:03:39 +0300
Subject: modernize more

---
 crates/ra_lsp_server/src/main.rs | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'crates/ra_lsp_server/src/main.rs')

diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index a50ac76ff..9ba972562 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -1,11 +1,5 @@
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate serde_derive;
-
-use serde::Deserialize;
+use serde_derive::Deserialize;
+use serde::Deserialize as _D;
 use flexi_logger::{Duplicate, Logger};
 use gen_lsp_server::{run_server, stdio_transport};
 use ra_lsp_server::Result;
@@ -17,15 +11,15 @@ fn main() -> Result<()> {
         .log_to_file()
         .directory("log")
         .start()?;
-    info!("lifecycle: server started");
+    log::info!("lifecycle: server started");
     match ::std::panic::catch_unwind(main_inner) {
         Ok(res) => {
-            info!("lifecycle: terminating process with {:?}", res);
+            log::info!("lifecycle: terminating process with {:?}", res);
             res
         }
         Err(_) => {
-            error!("server panicked");
-            bail!("server panicked")
+            log::error!("server panicked");
+            failure::bail!("server panicked")
         }
     }
 }
@@ -56,8 +50,8 @@ fn main_inner() -> Result<()> {
             ra_lsp_server::main_loop(false, root, publish_decorations, r, s)
         },
     )?;
-    info!("shutting down IO...");
+    log::info!("shutting down IO...");
     threads.join()?;
-    info!("... IO is down");
+    log::info!("... IO is down");
     Ok(())
 }
-- 
cgit v1.2.3