From 7962fe3f439856dd158ba61568a198d85c850afe Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Tue, 26 Oct 2021 07:06:45 -0700 Subject: [PATCH] update tracing-subscriber (#3473) which gets rid of the transitive dep on `chrono` that was affected by `RUSTSEC-2020-0159`. --- Cargo.lock | 50 +++------------------------ Cargo.toml | 2 +- crates/wiggle/test-helpers/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92eaf12aac..361fed14be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -420,18 +420,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "winapi", -] - [[package]] name = "cipher" version = "0.3.0" @@ -1568,15 +1556,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata", -] - [[package]] name = "maybe-owned" version = "0.3.4" @@ -2423,9 +2402,6 @@ name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] [[package]] name = "regex-syntax" @@ -2969,9 +2945,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] @@ -2987,36 +2963,18 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" -dependencies = [ - "serde", - "tracing-core", -] - [[package]] name = "tracing-subscriber" -version = "0.2.18" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" +checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52" dependencies = [ "ansi_term 0.12.1", - "chrono", - "lazy_static", - "matchers", - "regex", - "serde", - "serde_json", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", - "tracing-serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1f2bc42713..431ac4af00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ test-programs = { path = "crates/test-programs" } wasmtime-fuzzing = { path = "crates/fuzzing" } wasmtime-runtime = { path = "crates/runtime" } tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] } -tracing-subscriber = "0.2.16" +tracing-subscriber = "0.3.1" wast = "38.0.0" criterion = "0.3.4" num_cpus = "1.13.0" diff --git a/crates/wiggle/test-helpers/Cargo.toml b/crates/wiggle/test-helpers/Cargo.toml index b77fb9333e..b8360ec375 100644 --- a/crates/wiggle/test-helpers/Cargo.toml +++ b/crates/wiggle/test-helpers/Cargo.toml @@ -18,7 +18,7 @@ wiggle = { path = "..", features = ["tracing_log"] } [dev-dependencies] thiserror = "1.0" tracing = "0.1.26" -tracing-subscriber = "0.2.4" +tracing-subscriber = "0.3.1" env_logger = "0.8" [badges]