From 9f842199360def148beb63130b6427f260c31386 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sat, 19 Nov 2022 19:18:02 -0500 Subject: [PATCH] Update to tracing-browser-subscriber v0.2.0 --- Cargo.lock | 102 +++++++++++++++++++++++++----------- flake.lock | 6 +-- nix/kitchenWasm/default.nix | 2 +- web/Cargo.toml | 12 +++-- web/src/lib.rs | 14 ++--- 5 files changed, 91 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4387b2a..986a9f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,15 +47,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.62" @@ -1260,9 +1251,9 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "js-sys" -version = "0.3.58" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -1310,6 +1301,7 @@ dependencies = [ "sycamore-router", "tracing", "tracing-browser-subscriber", + "tracing-subscriber", "wasm-bindgen", "web-sys", ] @@ -1437,6 +1429,16 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -1516,6 +1518,12 @@ version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking" version = "2.0.0" @@ -1823,6 +1831,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.1.0" @@ -2423,20 +2437,21 @@ dependencies = [ [[package]] name = "tracing-browser-subscriber" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a55e269177d62b5581283809791473301d39f17a1d461af8270219f1b2f68a" +checksum = "3c1db17d6ec2a4c64d2678ca1457d6adf39f696ab7362e2cf30fbaa8d903b8cd" dependencies = [ "tracing", "tracing-subscriber", "wasm-bindgen", + "wasm-bindgen-test", ] [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -2455,14 +2470,15 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", + "nu-ansi-term", "sharded-slab", "smallvec", "thread_local", + "time 0.3.14", "tracing-core", "tracing-log", ] @@ -2636,9 +2652,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.81" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if 1.0.0", "serde", @@ -2648,13 +2664,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.81" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -2675,9 +2691,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.81" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2685,9 +2701,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.81" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -2698,15 +2714,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.81" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b30cf2cba841a812f035c40c50f53eb9c56181192a9dd2c71b65e6a87a05ba" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad594bf33e73cafcac2ae9062fc119d4f75f9c77e25022f91c9a64bd5b6463" +dependencies = [ + "proc-macro2", + "quote", +] [[package]] name = "web-sys" -version = "0.3.58" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/flake.lock b/flake.lock index 9ec517a..589f8f7 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1658437705, - "narHash": "sha256-W7vKDjTrEUmJ+JCdshU+KA2LecdBUekSgbwrKRLKBZU=", + "lastModified": 1668907448, + "narHash": "sha256-l71WVOLoOLTuVgdn69SX2IosITFu4eQJXVtJqAmg0Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6a0bb7262cfd242d67e8cff895ba80ed8da456b", + "rev": "e7cbe75849e582b20884f4b9651a80dffafffb16", "type": "github" }, "original": { diff --git a/nix/kitchenWasm/default.nix b/nix/kitchenWasm/default.nix index b56f3b5..bef1696 100644 --- a/nix/kitchenWasm/default.nix +++ b/nix/kitchenWasm/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { inherit src pname; version = version; - # we need wasmb-bindgen v0.2.81 exactly + # we need wasmb-bindgen v0.2.83 exactly buildInputs = [ rust-wasm wasm-bindgen-cli wasm-pack binaryen]; propagatedBuildInputs = [ rust-wasm wasm-bindgen-cli wasm-pack binaryen]; phases = [ "postUnpackPhase" "buildPhase"]; diff --git a/web/Cargo.toml b/web/Cargo.toml index 09ca669..0396a0e 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -18,11 +18,17 @@ recipes = { path = "../recipes" } console_error_panic_hook = "0.1.7" serde_json = "1.0.79" tracing = "0.1.35" -tracing-browser-subscriber = "0.1.0" async-trait = "0.1.57" base64 = "0.13.0" sycamore-router = "0.8" +[dependencies.tracing-subscriber] +version = "0.3.16" +features = ["fmt", "time"] + +[dependencies.tracing-browser-subscriber] +version = "0.2.0" + [dependencies.chrono] version = "0.4.22" features = ["serde"] @@ -31,8 +37,8 @@ features = ["serde"] version = "0.5.0" [dependencies.wasm-bindgen] -# we need wasm-bindgen v0.2.81 exactly -version = "= 0.2.81" +# we need wasm-bindgen v0.2.83 exactly +version = "= 0.2.83" [dependencies.web-sys] version = "0.3" diff --git a/web/src/lib.rs b/web/src/lib.rs index fc03a44..4ffdd55 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -20,18 +20,18 @@ mod routing; mod web; use sycamore::prelude::*; -#[cfg(feature = "web")] -use tracing_browser_subscriber; use wasm_bindgen::prelude::wasm_bindgen; use web::UI; +fn configure_tracing() { + use tracing_browser_subscriber; + console_error_panic_hook::set_once(); + tracing_browser_subscriber::configure_as_global_default(); +} + #[wasm_bindgen(start)] pub fn main() { - if cfg!(feature = "web") { - console_error_panic_hook::set_once(); - // TODO(jwall): use the tracing_subscriber_browser default setup function when it exists. - tracing_browser_subscriber::configure_as_global_default(); - } + configure_tracing(); sycamore::render(|cx| view! { cx, UI() }); }