diff --git a/Cargo.lock b/Cargo.lock index 7bfb739..dac5c74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1682,9 +1682,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a73e9fe3c49d7afb2ace819fa181a287ce54a0983eda4e0eb05c22f82ffe534" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "js-sys" @@ -1782,6 +1782,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -2172,6 +2182,29 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + [[package]] name = "pbkdf2" version = "0.12.2" @@ -2385,6 +2418,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "reflink-copy" version = "0.1.20" @@ -2630,6 +2672,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "security-framework" version = "2.11.1" @@ -2865,9 +2913,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -3050,6 +3098,7 @@ dependencies = [ "bytes", "libc", "mio", + "parking_lot", "pin-project-lite", "socket2", "tokio-macros", diff --git a/Cargo.toml b/Cargo.toml index 0e7c54d..af3edbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ reqwest-middleware = { version = "0.4.0", features = [ ] } serde = { version = "1.0.214", features = ["derive"] } serde_json = "1.0.133" -tokio = { version = "1", features = ["rt-multi-thread"] } +tokio = { version = "1", features = ["parking_lot", "rt-multi-thread"] } tracing = { version = "0.1.40", default-features = false, features = [ "attributes", "std", diff --git a/src/main.rs b/src/main.rs index 5db6956..02c3baf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,14 +21,13 @@ use gtk::{gio, glib}; pub mod mpv; -#[cfg(debug_assertions)] fn init_tracing() { - tracing_subscriber::fmt::init(); + #[cfg(debug_assertions)] + { + tracing_subscriber::fmt::init(); + } } -#[cfg(not(debug_assertions))] -fn init_tracing() {} - fn main() -> glib::ExitCode { // abort on any panic let orig_hook = std::panic::take_hook();