diff --git a/Cargo.lock b/Cargo.lock index d06e04a3f..6561d0460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2430,6 +2430,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memchr" version = "2.5.0" @@ -2724,6 +2733,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" @@ -2948,6 +2967,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "pango-sys" version = "0.15.10" @@ -3289,6 +3314,9 @@ 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" @@ -3411,7 +3439,6 @@ dependencies = [ "cpal", "dirs", "embed-resource", - "env_logger", "generational-arena", "isahc", "rfd", @@ -3419,6 +3446,7 @@ dependencies = [ "ruffle_render_wgpu", "ruffle_video_software", "tracing", + "tracing-subscriber", "url", "webbrowser", "winapi", @@ -3887,6 +3915,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.1.0" @@ -4231,6 +4268,15 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + [[package]] name = "threadpool" version = "1.8.1" @@ -4358,6 +4404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", + "valuable", ] [[package]] @@ -4370,6 +4417,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + [[package]] name = "transpose" version = "0.2.2" @@ -4442,6 +4518,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index dcc0ccf7e..f2169c746 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -13,7 +13,7 @@ cpal = "0.14.2" ruffle_core = { path = "../core", features = ["audio", "mp3", "nellymoser"] } ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } ruffle_video_software = { path = "../video/software", optional = true } -env_logger = { version = "0.10", default-features = false, features = ["humantime"] } +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } generational-arena = "0.2.8" tracing = "0.1.37" winit = "0.27.5" diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 85102b8cd..f4d77f212 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -840,7 +840,7 @@ fn init() { panic_hook(); })); - env_logger::init(); + tracing_subscriber::fmt::init(); } fn panic_hook() {