diff --git a/Cargo.lock b/Cargo.lock index 4dabafd9559..76a7ba93532 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,7 +93,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cbd542dd180566fad88fd2729a53a62a734843c626638006a9d63ec0688484e" dependencies = [ "android_log-sys", - "env_logger", + "env_logger 0.7.1", "lazy_static", "log", ] @@ -295,7 +295,7 @@ dependencies = [ "cfg-if 0.1.10", "clang-sys", "clap", - "env_logger", + "env_logger 0.7.1", "lazy_static", "lazycell", "log", @@ -1515,7 +1515,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" +dependencies = [ + "atty", + "humantime 2.0.1", "log", "regex", "termcolor", @@ -2681,6 +2694,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "humantime" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" + [[package]] name = "hyper" version = "0.12.35" @@ -3253,7 +3272,7 @@ dependencies = [ "devtools", "devtools_traits", "embedder_traits", - "env_logger", + "env_logger 0.8.2", "euclid", "gaol", "gfx", @@ -4564,7 +4583,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" dependencies = [ - "env_logger", + "env_logger 0.7.1", "log", "rand", "rand_core", @@ -5646,7 +5665,7 @@ version = "0.0.1" dependencies = [ "backtrace", "cbindgen", - "env_logger", + "env_logger 0.8.2", "keyboard-types", "lazy_static", "libc", diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 7c431f1c6b3..7fc827fa387 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -49,7 +49,7 @@ crossbeam-channel = "0.4" devtools = { path = "../devtools" } devtools_traits = { path = "../devtools_traits" } embedder_traits = { path = "../embedder_traits" } -env_logger = "0.7" +env_logger = "0.8" euclid = "0.20" gfx = { path = "../gfx" } gfx_traits = { path = "../gfx_traits" } diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml index a1906bb9557..dc3765d9b40 100644 --- a/ports/libsimpleservo/capi/Cargo.toml +++ b/ports/libsimpleservo/capi/Cargo.toml @@ -14,7 +14,7 @@ bench = false [dependencies] backtrace = "0.3" -env_logger = "0.7" +env_logger = "0.8" lazy_static = "1" log = "0.4" simpleservo = { path = "../api" } diff --git a/servo-tidy.toml b/servo-tidy.toml index 2bfb0823865..ccbf2e80a6d 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -34,8 +34,10 @@ packages = [ "cfg-if", "cloudabi", "cocoa", + "env_logger", "fixedbitset", "gleam", + "humantime", "libloading", "lock_api", "metal",