diff --git a/Cargo.lock b/Cargo.lock index 930ecd337e6e007fdbb0b57965fb20620ede1524..d5c9e10ca82b9a6fbb8bebd349c527dd5787a6df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1454,19 +1454,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.58" @@ -2139,24 +2126,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ndk" version = "0.7.0" @@ -2397,50 +2366,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -2703,7 +2628,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -2908,12 +2832,10 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -2924,7 +2846,6 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls", "tower-service", "url", @@ -3055,15 +2976,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -3099,29 +3011,6 @@ dependencies = [ "tiny-skia 0.8.4", ] -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "serde" version = "1.0.189" @@ -3624,16 +3513,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -3898,12 +3777,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 0951ca66e618a38709a3788dd82d1c8d0d4188f4..f4e62b8934303397dac114448e68c4fc3ba85037 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,18 +38,18 @@ opt-level = "s" panic = 'unwind' [workspace.dependencies] -log = "0.4" +url = { version = "2", default-features = false } +zbus = { version = "3", default-features = false, features = ["tokio"] } +chrono = { version = "0.4", default-features = false, features = ["clock"] } +sha256 = { version = "1", default-features = false, features = ["async"] } +anyhow = { version = "1", default-features = false, features = ["std"] } regex = { version = "1.9", default-features = false, features = [ "std", "perf", ] } -url = { version = "2", default-features = false } +log = "0.4" rand = "*" -zbus = { version = "3", default-features = false, features = ["tokio"] } -chrono = { version = "0.4", default-features = false, features = ["clock"] } -sha256 = { version = "1", default-features = false, features = ["async"] } base64 = "*" -anyhow = "1" dirs = "5" # Data Structures @@ -73,8 +73,11 @@ serde = { version = "1", default-features = false, features = [ # Async stuff async-trait = "0.1" -futures = "0.3" -tokio = { version = "1", features = [ +futures = { version = "0.3", default-features = false, features = [ + "std", + "async-await", +] } +tokio = { version = "1", default-features = false, features = [ "macros", "rt-multi-thread", "fs", @@ -83,7 +86,10 @@ tokio = { version = "1", features = [ tokio-stream = { version = "0.1", default-features = false } # Web stuff -reqwest = { version = "0.11", features = ["rustls-tls", "json"] } +reqwest = { version = "0.11", default-features = false, features = [ + "rustls-tls", + "json", +] } axum = { version = "0.6", default-features = false, features = [ "http1", "json", @@ -99,7 +105,7 @@ hyper = { version = "0.14", default-features = false, features = [ # Arguments roff = "0.2" -clap_complete = "4" +clap_complete = { version = "4", default-features = false } clap = { version = "4", default-features = false, features = [ "usage", "help", @@ -120,7 +126,7 @@ iced_aw = { version = "0.7", default-features = false, features = [ ] } # Proc macro things -quote = "1" syn = "2" +quote = { version = "1", default-features = false } proc-macro2 = { version = "1", default-features = false } -proc-macro-error = "1.0" +proc-macro-error = { version = "1.0", default-features = false }