diff --git a/Cargo.lock b/Cargo.lock index 5d188d55..db4d1256 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,12 +214,6 @@ dependencies = [ "x11rb", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "arg_enum_proc_macro" version = "0.3.4" @@ -249,12 +243,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" -[[package]] -name = "ascii_utils" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" - [[package]] name = "ashpd" version = "0.9.2" @@ -354,12 +342,10 @@ dependencies = [ "base64 0.21.7", "bytes", "chrono", - "fast_chemail", "fnv", "futures-channel", "futures-timer", "futures-util", - "handlebars", "http 1.1.0", "indexmap 2.5.0", "log", @@ -374,7 +360,6 @@ dependencies = [ "serde_json", "serde_urlencoded", "static_assertions_next", - "tempfile", "thiserror", ] @@ -633,33 +618,6 @@ dependencies = [ "arrayvec", ] -[[package]] -name = "aws-lc-rs" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" -dependencies = [ - "aws-lc-sys", - "mirai-annotations", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234314bd569802ec87011d653d6815c6d7b9ffb969e9fee5b8b20ef860e8dce9" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - [[package]] name = "axum" version = "0.7.5" @@ -738,7 +696,6 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -747,7 +704,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8" dependencies = [ - "arc-swap", "bytes", "futures-util", "http 1.1.0", @@ -756,11 +712,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "pin-project-lite", - "rustls 0.23.12", - "rustls-pemfile 2.1.3", - "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", "tower", "tower-service", ] @@ -813,29 +765,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.77", - "which", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1088,15 +1017,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfb" version = "0.7.3" @@ -1155,17 +1075,6 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.5", -] - [[package]] name = "clap" version = "4.5.17" @@ -1215,15 +1124,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - [[package]] name = "cocoa" version = "0.26.0" @@ -2080,15 +1980,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "fast_chemail" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" -dependencies = [ - "ascii_utils", -] - [[package]] name = "fastrand" version = "2.1.1" @@ -2141,7 +2032,6 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "nanorand", "spin", ] @@ -2187,12 +2077,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futf" version = "0.1.5" @@ -2841,20 +2725,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "handlebars" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -3503,11 +3373,9 @@ checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", "js-sys", - "pem", "ring", "serde", "serde_json", - "simple_asn1", ] [[package]] @@ -3543,12 +3411,6 @@ dependencies = [ "spin", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lebe" version = "0.5.2" @@ -3830,12 +3692,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "muda" version = "0.15.1" @@ -3873,15 +3729,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.15", -] - [[package]] name = "ndk" version = "0.9.0" @@ -4468,16 +4315,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4504,40 +4341,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pest_derive" -version = "2.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "pest_meta" -version = "2.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - [[package]] name = "pharos" version = "0.5.3" @@ -4823,16 +4626,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "prettyplease" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" -dependencies = [ - "proc-macro2", - "syn 2.0.77", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -4979,7 +4772,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash", "rustls 0.23.12", "socket2", "thiserror", @@ -4996,7 +4789,7 @@ dependencies = [ "bytes", "rand 0.8.5", "ring", - "rustc-hash 2.0.0", + "rustc-hash", "rustls 0.23.12", "slab", "thiserror", @@ -5465,12 +5258,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -5517,7 +5304,6 @@ version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "aws-lc-rs", "log", "once_cell", "ring", @@ -5568,7 +5354,6 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5957,18 +5742,6 @@ dependencies = [ "quote", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -8142,18 +7915,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "whoami" version = "1.5.2" diff --git a/crates/tanoshi-notifier/Cargo.toml b/crates/tanoshi-notifier/Cargo.toml index 1cac9bd2..68554130 100644 --- a/crates/tanoshi-notifier/Cargo.toml +++ b/crates/tanoshi-notifier/Cargo.toml @@ -11,9 +11,6 @@ serde_json = "1.0" teloxide = { version = "0.13", default-features = false, features = ["ctrlc_handler", "macros", "rustls"] } chrono = { version = "0.4", features = ["serde"] } anyhow = "1" -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "rustls-tls", -] } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } log = { version = "0.4" } async-trait = "0.1" diff --git a/crates/tanoshi-tauri/Cargo.toml b/crates/tanoshi-tauri/Cargo.toml index 8acebcc8..bf569717 100644 --- a/crates/tanoshi-tauri/Cargo.toml +++ b/crates/tanoshi-tauri/Cargo.toml @@ -8,13 +8,13 @@ build = "src/build.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0", features = [] } +tauri-build = "2.0" [dependencies] serde_json = "1.0" serde = { version = "1", features = ["derive"] } -tauri = { version = "2.0", features = [ 'rustls-tls' ] } -tanoshi = { path = "../tanoshi", default-features = false, features = ["server"] } +tauri = { version = "2.0", features = ["rustls-tls"] } +tanoshi = { path = "../tanoshi", default-features = false, features = ["server"], version = "*" } tanoshi-vm = { path = "../tanoshi-vm", default-features = false } tanoshi-tracker = { path = "../tanoshi-tracker" } tokio = { version = "1", features = ["full"] } diff --git a/crates/tanoshi-tracker/Cargo.toml b/crates/tanoshi-tracker/Cargo.toml index 2f69374a..fba15c79 100644 --- a/crates/tanoshi-tracker/Cargo.toml +++ b/crates/tanoshi-tracker/Cargo.toml @@ -11,10 +11,7 @@ serde_json = "1.0" oauth2 = { version = "4", default-features = false, features = ["pkce-plain", "rustls-tls"] } chrono = { version = "0.4", features = ["serde"] } anyhow = "1" -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "rustls-tls", -] } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } log = { version = "0.4" } async-trait = "0.1" thiserror = "1" diff --git a/crates/tanoshi-vm/Cargo.toml b/crates/tanoshi-vm/Cargo.toml index 13db7b1e..7e713c51 100644 --- a/crates/tanoshi-vm/Cargo.toml +++ b/crates/tanoshi-vm/Cargo.toml @@ -14,14 +14,7 @@ bytes = "1" log = { version = "0.4" } anyhow = "1" tokio = { version = "1", features = ["full"] } -reqwest = { version = "0.12", default-features = false, features = [ - "cookies", - "gzip", - "brotli", - "deflate", - "json", - "rustls-tls", -] } +reqwest = { version = "0.12", default-features = false, features = ["brotli", "cookies", "deflate", "gzip", "json", "rustls-tls"] } fnv = "1" libloading = "0.8" once_cell = "1" diff --git a/crates/tanoshi-web/Cargo.toml b/crates/tanoshi-web/Cargo.toml index 7f6f5f29..7c2ec388 100644 --- a/crates/tanoshi-web/Cargo.toml +++ b/crates/tanoshi-web/Cargo.toml @@ -24,48 +24,13 @@ serde_json = "1.0" futures-signals = "0.3" futures = "0.3" js-sys = "0.3" -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "rustls-tls", -] } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } base64 = "0.22" -gloo-timers = { version = "0.3", features = [ "futures" ] } +gloo-timers = { version = "0.3", features = ["futures"] } anyhow = "1" ws_stream_wasm = "0.7" -graphql-ws-client = { version = "0.10", features = [ - "client-graphql-client", - "ws_stream_wasm", -] } +graphql-ws-client = { version = "0.10", features = ["client-graphql-client", "ws_stream_wasm"] } [dependencies.web-sys] version = "0.3" -features = [ - 'Document', - 'Element', - 'HtmlCollection', - 'HtmlElement', - 'HtmlImageElement', - 'HtmlSelectElement', - 'HtmlOptionElement', - 'Node', - 'Window', - 'CssStyleDeclaration', - 'Url', - 'UrlSearchParams', - 'Cache', - 'CacheStorage', - 'EventSource', - 'MessageEvent', - 'Location', - 'FocusEvent', - 'ErrorEvent', - 'Storage', - 'PopStateEvent', - 'MediaQueryList', - 'MediaQueryListEvent', - 'Navigator', - 'ServiceWorkerContainer', - 'Notification', - 'NotificationPermission', - 'NotificationOptions', -] +features = ["Cache", "CacheStorage", "CssStyleDeclaration", "Document", "ErrorEvent", "EventSource", "FocusEvent", "HtmlCollection", "HtmlImageElement", "HtmlOptionElement", "HtmlSelectElement", "Location", "MediaQueryList", "MediaQueryListEvent", "MessageEvent", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "PopStateEvent", "ServiceWorkerContainer", "Storage", "Url", "UrlSearchParams", "Window"] diff --git a/crates/tanoshi/Cargo.toml b/crates/tanoshi/Cargo.toml index 82d3ac2e..6c49f09d 100644 --- a/crates/tanoshi/Cargo.toml +++ b/crates/tanoshi/Cargo.toml @@ -27,24 +27,19 @@ tanoshi-lib = { path = "../tanoshi-lib" } tanoshi-vm = { path = "../tanoshi-vm" } tanoshi-tracker = { path = "../tanoshi-tracker" } tanoshi-notifier = { path = "../tanoshi-notifier" } -tokio = { version = "1", features = ["full"] } -tokio-stream = { version = "0.1", features = ["sync"] } -serde = { version = "1.0", features = ["derive"] } +tokio = "1" +tokio-stream = { version = "0.1", features = ["sync"], default-features = false } +serde = { version = "1.0", default-features = false } serde_json = "1.0" serde_yml = "0.0.11" bincode = "1" -async-graphql = { version = "7", features = [ - "apollo_tracing", - "chrono", - "dataloader", - "log", -] } +async-graphql = { version = "7", features = ["chrono", "dataloader", "log", "playground"], default-features = false } async-graphql-axum = { version = "7", optional = true } -axum = { version = "0.7.5", optional = true } -axum-server = { version = "0.7", features = [ "tls-rustls" ] } -axum-extra = { version = "0.9", features = [ "typed-header" ]} +axum = { version = "0.7.5", optional = true , default-features = false } +axum-server = "0.7" +axum-extra = { version = "0.9", features = ["typed-header"], default-features = false } headers = { version = "0.4", optional = true } -http = { version = "1", optional = true } +http = { version = "1", optional = true , default-features = false } tower-http = { version = "0.5", features = [ "cors", "compression-br", @@ -52,46 +47,40 @@ tower-http = { version = "0.5", features = [ "compression-gzip", "compression-zstd", ], optional = true } -rand = { version = "0.8" } +rand = { version = "0.8", default-features = false } log = { version = "0.4" } -env_logger = "0.11" -jsonwebtoken = "9" -chrono = { version = "0.4", features = ["serde"] } -anyhow = "1" +env_logger = { version = "0.11", default-features = false } +jsonwebtoken = { version = "9", default-features = false } +chrono = { version = "0.4", default-features = false } +anyhow = { version = "1", default-features = false } thiserror = "1" -rust-embed = { version = "8", features = [ - "interpolate-folder-path", -], optional = true } -mime_guess = "2" +rust-embed = { version = "8", optional = true , features = ["interpolate-folder-path"] } +mime_guess = { version = "2", default-features = false } clap = { version = "4", features = ["derive"] } -bytes = "1" +bytes = { version = "1", default-features = false } dirs = "5" -base64 = "0.22" +base64 = { version = "0.22", default-features = false } sqlx = { version = "0.8", features = [ "runtime-tokio", - "tls-rustls", + "tls-rustls-ring", "sqlite", "chrono", "json", + "macros", "migrate", -] } -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "rustls-tls", -] } -futures = "0.3" +], default-features = false } +reqwest = { version = "0.12", default-features = false } +futures = { version = "0.3", default-features = false } rust-argon2 = "2" -fancy-regex = "0.13" -compress-tools = { git = "https://github.com/OSSystems/compress-tools-rs", rev = "615e54549ce08695a45c7f38d3fbd10827ed140c", features = [ - "static", -] } +fancy-regex = { version = "0.13", features = ["std"], default-features = false } +compress-tools = { git = "https://github.com/OSSystems/compress-tools-rs", rev = "615e54549ce08695a45c7f38d3fbd10827ed140c" , features = ["static"]} zip = { version = "2", default-features = false } -phf = { version = "0.11", features = ["macros"] } +phf = { version = "0.11", features = ["macros"], default-features = false } human-sort = "0.2" aes = "0.8" cbc = "0.1" -once_cell = "1" +once_cell = { version = "1", default-features = false } async-trait = "0.1" -itertools = "0.13" +itertools = { version = "0.13", features = ["use_alloc"], default-features = false } rayon = "1.10" -flume = "0.11" +flume = { version = "0.11", default-features = false }