From c98f904a4d978ef7bdbfc12388de5d993310effb Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Thu, 12 Sep 2019 21:46:02 +0000 Subject: [PATCH] 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 --- Cargo.lock | 38 ++++++++++++++++---------- js/rust/Cargo.toml | 2 +- js/src/frontend/binast/Cargo.toml | 2 +- js/src/wasm/cranelift/Cargo.toml | 2 +- servo/ports/geckolib/tests/Cargo.toml | 2 +- toolkit/library/rust/shared/Cargo.toml | 2 +- toolkit/library/rust/shared/lib.rs | 4 +-- 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e50a9e8a9346..594541716e55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,7 +200,7 @@ dependencies = [ "bindgen 0.51.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.42.0 (git+https://github.com/CraneStation/Cranelift?rev=bdfd2adc6e2052319d04d9400122c5b49939f404)", "cranelift-wasm 0.42.0 (git+https://github.com/CraneStation/Cranelift?rev=bdfd2adc6e2052319d04d9400122c5b49939f404)", - "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -233,7 +233,7 @@ dependencies = [ "Inflector 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "binjs_meta 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1029,14 +1029,14 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.5.6" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1254,7 +1254,7 @@ dependencies = [ "encoding_c 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_c_mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_glue 0.1.0", - "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "geckoservo 0.0.1", "gkrust_utils 0.1.0", "jsrust_shared 0.1.0", @@ -1506,7 +1506,7 @@ version = "0.1.4" dependencies = [ "bindgen 0.51.0 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3047,7 +3047,7 @@ dependencies = [ "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.25.7 (registry+https://github.com/rust-lang/crates.io-index)", "cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "geckoservo 0.0.1", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3149,10 +3149,10 @@ dependencies = [ [[package]] name = "termcolor" -version = "0.3.6" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3739,6 +3739,14 @@ name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "git+https://github.com/froydnj/winapi-rs?branch=aarch64#ac8afeb7006b272bfaa470d8a252c959c175ffec" +[[package]] +name = "winapi-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3746,10 +3754,11 @@ source = "git+https://github.com/froydnj/winapi-rs?branch=aarch64#ac8afeb7006b27 [[package]] name = "wincolor" -version = "0.1.6" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)", + "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3960,7 +3969,7 @@ dependencies = [ "checksum encoding_c_mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9516d857aa9e070e02890ed3906f678ffca7fac8d82bd53c3567d96337f256" "checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" "checksum enum-display-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "53f76eb63c4bfc6fce5000f106254701b741fc9a65ee08445fde0ff39e583f1c" -"checksum env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0561146661ae44c579e993456bc76d11ce1e0c7d745e57b2fa7146b6e49fa2ad" +"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" "checksum euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4786521fec183792e755bf32cd0188e4e7628c6d0fcfd51426435b9081a106" "checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" @@ -4146,7 +4155,7 @@ dependencies = [ "checksum target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a" "checksum tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b" "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209" -"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" "checksum thin-slice 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" @@ -4199,8 +4208,9 @@ dependencies = [ "checksum winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)" = "" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)" = "" +"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)" = "" -"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a" "checksum ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" diff --git a/js/rust/Cargo.toml b/js/rust/Cargo.toml index 7f1e7d762f30..c86ecd1a9809 100644 --- 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 index d44149048c2e..d8dc7e4e433c 100644 --- 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 index 6f9f5255192a..da911da0560e 100644 --- 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 index baaf5c230980..64f4ce9c83d5 100644 --- 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 index 116fbf7e1d91..0788d37ec1d8 100644 --- 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 index 0475d4b22197..616defc79ad7 100644 --- 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 {