Bump tracing-subscriber to 0.3.2

We were pulling two versions of it. Causing some compilation errors

Cargo.lock

@@ -560,7 +560,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "serde",
- "time",
+ "time 0.1.44",
  "winapi 0.3.9",
 ]
 
@@ -3009,9 +3009,9 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
  "regex-automata",
 ]
@@ -5627,6 +5627,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
+dependencies = [
+ "itoa",
+ "libc",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -5747,13 +5757,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-appender"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9965507e507f12c8901432a33e31131222abac31edd90cabbcf85cf544b7127a"
+checksum = "94571df2eae3ed4353815ea5a90974a594a1792d8782ff2cbcc9392d1101f366"
 dependencies = [
- "chrono",
  "crossbeam-channel",
- "tracing-subscriber 0.2.25",
+ "time 0.3.5",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -5789,34 +5799,23 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.25"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+checksum = "7507ec620f809cdf07cccb5bc57b13069a88031b795efd4079b1c71b66c1613d"
 dependencies = [
  "ansi_term 0.12.1",
- "chrono",
  "lazy_static",
  "matchers",
  "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "time 0.3.5",
  "tracing",
  "tracing-core",
  "tracing-log",
 ]
 
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-tracy"
 version = "0.8.0"
@@ -5824,7 +5823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773057bb2b440e868776522a0587f732b1125116f12aca0eb37dea48d55ad2cd"
 dependencies = [
  "tracing-core",
- "tracing-subscriber 0.3.1",
+ "tracing-subscriber",
  "tracy-client",
 ]
 
@@ -6095,7 +6094,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "uuid",
  "vek",
  "veloren-common-assets",
@@ -6143,7 +6142,7 @@ dependencies = [
  "tracing",
  "tracing-appender",
  "tracing-log",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "tracing-tracy",
  "veloren-common-base",
 ]
@@ -6236,7 +6235,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "veloren-network-protocol",
 ]
 
@@ -6531,7 +6530,7 @@ dependencies = [
  "strum",
  "svg_fmt",
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "vek",
  "veloren-common",
  "veloren-common-base",

common/Cargo.toml

@@ -82,7 +82,7 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "8be2abc
 criterion = "0.3"
 
 #test
-tracing-subscriber = { version = "0.2.25", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec", "env-filter"] }
+tracing-subscriber = { version = "0.3.2", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }
 
 [[bench]]
 name = "chonk_benchmark"

common/frontend/Cargo.toml

@@ -14,9 +14,9 @@ common-base = { package = "veloren-common-base", path = "../base" }
 # Logging
 termcolor = "1.1"
 tracing = { version = "0.1", default-features = false }
-tracing-appender = "0.1.2"
+tracing-appender = "0.2.0"
 tracing-log = "0.1.1"
-tracing-subscriber = { version = "0.2.25", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec", "tracing-log"]}
+tracing-subscriber = { version = "0.3.2", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec", "tracing-log"]}
 
 # Tracy
 tracing-tracy = { version = "0.8.0", optional = true }

common/frontend/src/lib.rs

@@ -32,10 +32,10 @@ const RUST_LOG_ENV: &str = "RUST_LOG";
 ///
 /// By default a few directives are set to `warn` by default, until explicitly
 /// overwritten! e.g. `RUST_LOG="gfx_device_gl=debug"`
-pub fn init<W2>(log_path_file: Option<(&Path, &str)>, terminal: W2) -> Vec<impl Drop>
+pub fn init<W2>(log_path_file: Option<(&Path, &str)>, terminal: &'static W2) -> Vec<impl Drop>
 where
-    W2: MakeWriter + 'static,
-    <W2 as MakeWriter>::Writer: Send + Sync,
+    W2: MakeWriter<'static> + 'static,
+    <W2 as MakeWriter<'static>>::Writer: 'static + Send + Sync,
 {
     // To hold the guards that we create, they will cause the logs to be
     // flushed when they're dropped.
@@ -157,5 +157,5 @@ where
 }
 
 pub fn init_stdout(log_path_file: Option<(&Path, &str)>) -> Vec<impl Drop> {
-    init(log_path_file, || StandardStream::stdout(ColorChoice::Auto))
+    init(log_path_file, &|| StandardStream::stdout(ColorChoice::Auto))
 }

network/Cargo.toml

@@ -47,7 +47,7 @@ bytes = "^1"
 hashbrown = { version = ">=0.9, <0.12" }
 
 [dev-dependencies]
-tracing-subscriber = { version = "0.2.25", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] }
+tracing-subscriber = { version = "0.3.2", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] }
 tokio = { version = "1.14", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] }
 futures-util = { version = "0.3.7", default-features = false, features = ["sink", "std"] }
 clap = { version = "2.33", default-features = false }

server-cli/src/main.rs

@@ -51,7 +51,7 @@ fn main() -> io::Result<()> {
     let (_guards, _guards2) = if basic {
         (vec![], common_frontend::init_stdout(None))
     } else {
-        (common_frontend::init(None, || LOG.clone()), vec![])
+        (common_frontend::init(None, &|| LOG.clone()), vec![])
     };
 
     // Load settings

world/Cargo.toml

@@ -52,7 +52,7 @@ clap = { version = "2.33.3", optional = true }
 common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" }
 criterion = "0.3"
 csv = "1.1.3"
-tracing-subscriber = { version = "0.2.25", default-features = false, features = ["fmt", "chrono", "ansi", "smallvec", "env-filter"] }
+tracing-subscriber = { version = "0.3.2", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }
 minifb = "0.19.1"
 rusqlite = { version = "0.24.2", features = ["array", "vtab", "bundled", "trace"] }
 svg_fmt = "0.4"