From 9c01c0dcb5308d8d50ddf2d3fad6599fbff7d3dd Mon Sep 17 00:00:00 2001
From: Alexander Ekdahl <alexander@ekdahl.io>
Date: Fri, 29 Nov 2019 19:20:48 -0500
Subject: Use env_logger in ra_cli

---
 crates/ra_cli/Cargo.toml  | 7 ++++++-
 crates/ra_cli/src/main.rs | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'crates/ra_cli')

diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index c7e0d0f0f..9718b4b54 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 pico-args = "0.3.0"
-flexi_logger = "0.14.0"
+log = "0.4"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_ide = { path = "../ra_ide" }
@@ -19,3 +19,8 @@ ra_db = { path = "../ra_db" }
 path = "../ra_prof"
 # features = [ "cpu_profiler" ]
 # features = [ "jemalloc" ]
+
+[dependencies.env_logger]
+version = "0.7.1"
+default-features = false
+features = ["humantime"]
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index fe847e611..3808590ab 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -7,7 +7,6 @@ mod progress_report;
 
 use std::{error::Error, fmt::Write, io::Read};
 
-use flexi_logger::Logger;
 use pico_args::Arguments;
 use ra_ide::{file_structure, Analysis};
 use ra_prof::profile;
@@ -32,7 +31,7 @@ impl Verbosity {
 }
 
 fn main() -> Result<()> {
-    Logger::with_env_or_str("error").start()?;
+    env_logger::try_init()?;
 
     let subcommand = match std::env::args_os().nth(1) {
         None => {
-- 
cgit v1.2.3


From eb4e70fc676a97a7b411f372be1727df51a8906a Mon Sep 17 00:00:00 2001
From: Alexander Ekdahl <alexander@ekdahl.io>
Date: Fri, 29 Nov 2019 19:35:03 -0500
Subject: Remove flexi_logger from ra_lsp_server

---
 crates/ra_cli/Cargo.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'crates/ra_cli')

diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 9718b4b54..f63f40c99 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -8,6 +8,7 @@ publish = false
 [dependencies]
 pico-args = "0.3.0"
 log = "0.4"
+env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] }
 
 ra_syntax = { path = "../ra_syntax" }
 ra_ide = { path = "../ra_ide" }
@@ -19,8 +20,3 @@ ra_db = { path = "../ra_db" }
 path = "../ra_prof"
 # features = [ "cpu_profiler" ]
 # features = [ "jemalloc" ]
-
-[dependencies.env_logger]
-version = "0.7.1"
-default-features = false
-features = ["humantime"]
-- 
cgit v1.2.3


From 3fe539ce51f417605a6da6bc3c6d135053b1ee67 Mon Sep 17 00:00:00 2001
From: Alexander Ekdahl <alexander@ekdahl.io>
Date: Fri, 29 Nov 2019 19:40:59 -0500
Subject: Remove log dependency from ra_cli

---
 crates/ra_cli/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'crates/ra_cli')

diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index f63f40c99..21a37c7bf 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,6 @@ publish = false
 
 [dependencies]
 pico-args = "0.3.0"
-log = "0.4"
 env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] }
 
 ra_syntax = { path = "../ra_syntax" }
-- 
cgit v1.2.3