Merge pull request #663 from alexheretic/log-0.4

Upgrade log 0.3 -> 0.4

Author: Xanewok

Cargo.lock

@@ -11,12 +11,12 @@ build = "build.rs"
 
 [dependencies]
 cargo = { git = "https://github.com/rust-lang/cargo" }
-env_logger = "0.4"
+env_logger = "0.5"
 failure = "0.1.1"
 jsonrpc-core = "8.0.1"
 languageserver-types = "0.27"
 lazy_static = "1"
-log = "0.3"
+log = "0.4"
 racer = "2.0.12"
 rls-analysis = "0.10"
 rls-data = { version = "0.14", features = ["serialize-serde"] }

Cargo.toml

@@ -93,7 +93,7 @@ type Span = span::Span<span::ZeroIndexed>;
 /// The main entry point to the RLS. Parses CLI arguments and then runs the
 /// server.
 pub fn main() {
-    env_logger::init().unwrap();
+    env_logger::init();
 
     if env::var(RUSTC_SHIM_ENV_VAR_NAME)
         .map(|v| v != "0")

src/main.rs

@@ -37,7 +37,7 @@ impl Environment {
             static ref COUNTER: AtomicUsize = AtomicUsize::new(0);
         }
 
-        let _ = env_logger::init();
+        let _ = env_logger::try_init();
         if env::var("RUSTC").is_err() {
             env::set_var("RUSTC", "rustc");
         }

src/test/harness.rs

@@ -1041,7 +1041,7 @@ fn test_omit_init_build() {
 
 #[test]
 fn test_parse_error_on_malformed_input() {
-    let _ = env_logger::init();
+    let _ = env_logger::try_init();
     struct NoneMsgReader;
 
     impl ls_server::MessageReader for NoneMsgReader {