From f8a44d0ad45703fb6e21fc5234fca9e6917a2a5f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 1 Apr 2022 02:26:19 -0400 Subject: [PATCH] Remove env_logger duplicate. --- Cargo.lock | 35 +++++++++----------------- components/layout_2020/Cargo.toml | 2 +- ports/libsimpleservo/jniapi/Cargo.toml | 2 +- servo-tidy.toml | 1 - 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a79cdd7cb09..a2b2b6e8287 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,18 +89,18 @@ checksum = "80b9e34fcbf29c0563547cb2ecce9b49504597cad6166769b1e4efb45c6c2951" [[package]] name = "android_log-sys" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" [[package]] name = "android_logger" -version = "0.8.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd542dd180566fad88fd2729a53a62a734843c626638006a9d63ec0688484e" +checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66" dependencies = [ "android_log-sys", - "env_logger 0.7.1", + "env_logger", "lazy_static", "log", ] @@ -315,7 +315,7 @@ dependencies = [ "cexpr", "clang-sys", "clap", - "env_logger 0.8.2", + "env_logger", "lazy_static", "lazycell", "log", @@ -1613,16 +1613,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "log", - "regex", -] - [[package]] name = "env_logger" version = "0.8.2" @@ -3457,7 +3447,7 @@ dependencies = [ "devtools", "devtools_traits", "embedder_traits", - "env_logger 0.8.2", + "env_logger", "euclid", "gaol", "gfx", @@ -4925,14 +4915,13 @@ dependencies = [ [[package]] name = "quickcheck" -version = "0.9.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", - "rand 0.7.3", - "rand_core 0.5.1", + "rand 0.8.5", ] [[package]] @@ -5999,7 +5988,7 @@ version = "0.0.1" dependencies = [ "backtrace", "cbindgen", - "env_logger 0.8.2", + "env_logger", "keyboard-types", "lazy_static", "libc", diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml index 0a186fe47a2..dad13222760 100644 --- a/components/layout_2020/Cargo.toml +++ b/components/layout_2020/Cargo.toml @@ -47,4 +47,4 @@ webrender_api = { git = "https://github.com/servo/webrender" } [dev-dependencies] lazy_static = "1" -quickcheck = "0.9" +quickcheck = "1" diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml index 5019219baf0..c4be5a2334c 100644 --- a/ports/libsimpleservo/jniapi/Cargo.toml +++ b/ports/libsimpleservo/jniapi/Cargo.toml @@ -15,7 +15,7 @@ bench = false [dependencies] android_injected_glue = "0.2" -android_logger = "0.8" +android_logger = "0.10" gstreamer = "0.15" jni = "0.18.0" libc = "0.2" diff --git a/servo-tidy.toml b/servo-tidy.toml index 7f57e2fde1d..10ced931923 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -37,7 +37,6 @@ packages = [ "crossbeam-channel", "crossbeam-utils", "deflate", - "env_logger", "fixedbitset", "getrandom", "gleam",