Bug 1580908 - Part 2: Update env_logger to 0.6. r=froydnj

This is one less dependency on regex 0.2 Differential Revision: https://phabricator.services.mozilla.com/D45711 --HG-- extra : moz-landing-system : lando
dothq · Sep 12, 2019 · c98f904 · c98f904
1 parent 081b889
commit c98f904
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/js/rust/Cargo.toml b/js/rust/Cargo.toml
@@ -6,7 +6,7 @@ build = "build.rs"
 license = "MPL-2.0"
 
 [build-dependencies]
-env_logger = {version = "0.5", default-features = false} # disable `regex` to reduce code size
+env_logger = {version = "0.6", default-features = false} # disable `regex` to reduce code size
 bindgen = {version = "0.51", default-features = false} # disable `logging` to reduce code size
 cmake = "0.1"
 glob = "0.2.11"

diff --git a/js/src/frontend/binast/Cargo.toml b/js/src/frontend/binast/Cargo.toml
@@ -7,7 +7,7 @@ autobins = false
 [dependencies]
 binjs_meta = "^0.5.2"
 clap = "^2"
-env_logger = "^0.5.6"
+env_logger = "^0.6"
 Inflector = "^0.11"
 itertools = "^0.8"
 log = "0.4"

diff --git a/js/src/wasm/cranelift/Cargo.toml b/js/src/wasm/cranelift/Cargo.toml
@@ -19,7 +19,7 @@ name = "baldrdash"
 cranelift-codegen = { version = "0.42", default-features = false }
 cranelift-wasm = "0.42"
 log = { version = "0.4.6", default-features = false, features = ["release_max_level_info"] }
-env_logger = "0.5.6"
+env_logger = "0.6"
 smallvec = { version = "0.6.6" }
 
 [build-dependencies]

diff --git a/servo/ports/geckolib/tests/Cargo.toml b/servo/ports/geckolib/tests/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 atomic_refcell = "0.1"
 cssparser = "0.25"
 cstr = "0.1.2"
-env_logger = { version = "0.5", default-features = false }
+env_logger = { version = "0.6", default-features = false }
 geckoservo = {path = "../../../ports/geckolib"}
 libc = "0.2"
 log = {version = "0.4", features = ["release_max_level_info"]}

diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
@@ -33,7 +33,7 @@ rsdparsa_capi = { path = "../../../../media/webrtc/signaling/src/sdp/rsdparsa_ca
 xulstore = { path = "../../../components/xulstore", optional = true }
 # We have these to enforce common feature sets for said crates.
 log = {version = "0.4", features = ["release_max_level_info"]}
-env_logger = {version = "0.5", default-features = false} # disable `regex` to reduce code size
+env_logger = {version = "0.6", default-features = false} # disable `regex` to reduce code size
 cose-c = { version = "0.1.5" }
 jsrust_shared = { path = "../../../../js/src/rust/shared" }
 arrayvec = "0.4"

diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
@@ -83,8 +83,8 @@ impl GeckoLogger {
         let mut builder = env_logger::Builder::new();
         let default_level = if cfg!(debug_assertions) { "warn" } else { "error" };
         let logger = match env::var("RUST_LOG") {
-            Ok(v) => builder.parse(&v).build(),
-            _ => builder.parse(default_level).build(),
+            Ok(v) => builder.parse_filters(&v).build(),
+            _ => builder.parse_filters(default_level).build(),
         };
 
         GeckoLogger {