From 275fc0c2be3e623900ceea174af4cc1f204b83a0 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Mon, 28 Jul 2025 01:08:53 +0200 Subject: [PATCH] Loco upgrade to 0.16.3 --- Cargo.lock | 317 +++++++------------------------------------- Cargo.toml | 4 +- src/models/users.rs | 2 +- 3 files changed, 49 insertions(+), 274 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d39d43d..1d28d2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -529,7 +529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d28de81c708c843640982b66573df0f0168d87e42854b563971f326745aab7" dependencies = [ "btparse-stable", - "colored", + "colored 2.2.0", "regex", "thiserror 1.0.69", ] @@ -546,18 +546,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" -[[package]] -name = "bb8" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" -dependencies = [ - "async-trait", - "futures-util", - "parking_lot", - "tokio", -] - [[package]] name = "bigdecimal" version = "0.4.8" @@ -866,6 +854,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "combine" version = "4.6.7" @@ -907,15 +904,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "cookie" version = "0.18.1" @@ -987,17 +975,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "cron_clock" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8699d8ed16e3db689f8ae04d8dc3c6666a4ba7e724e5a157884b7cc385d16b" -dependencies = [ - "chrono", - "nom 7.1.3", - "once_cell", -] - [[package]] name = "crossbeam-channel" version = "0.5.15" @@ -1205,27 +1182,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1260,21 +1216,21 @@ dependencies = [ [[package]] name = "duct" -version = "0.13.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" dependencies = [ "libc", - "once_cell", "os_pipe", "shared_child", + "shared_thread", ] [[package]] name = "duct_sh" -version = "0.13.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6633cadba557545fbbe0299a2f9adc4bb2fc5fb238773f5e841e0c23d62146" +checksum = "c8139179d1d133ab7153920ba3812915b17c61e2514a6f98b1fd03f2c07668d1" dependencies = [ "duct", ] @@ -1634,16 +1590,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "getopts" version = "0.2.23" @@ -1979,7 +1925,6 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.2", ] [[package]] @@ -2268,17 +2213,6 @@ dependencies = [ "serde", ] -[[package]] -name = "is-terminal" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2385,16 +2319,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" -[[package]] -name = "libredox" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" -dependencies = [ - "bitflags", - "libc", -] - [[package]] name = "libsqlite3-sys" version = "0.30.1" @@ -2430,13 +2354,13 @@ dependencies = [ [[package]] name = "loco-gen" -version = "0.15.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6a65aa52f43363e67c8e300d997f55a79bf5b7b3ad02e794dfd0414d012ecd" +checksum = "f1335adbe4464b3d2cdc7f6578b9a2fef968920c1634ea6cdef8bb59d566b095" dependencies = [ "chrono", "clap", - "colored", + "colored 3.0.0", "cruet 0.14.0", "duct", "heck 0.4.1", @@ -2452,9 +2376,9 @@ dependencies = [ [[package]] name = "loco-rs" -version = "0.15.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1122ebb1e981888d26ecbf33e323bf9816b3748b57a3fd5e67b37cfe44750e3" +checksum = "9d64206eff76d0f5eb673cb2f6b001980d2110f8ddfaf4ced9117d02befa10c5" dependencies = [ "argon2", "async-trait", @@ -2462,20 +2386,18 @@ dependencies = [ "axum-extra", "axum-test", "backtrace_printer", - "bb8", "byte-unit", "bytes", - "cfg-if", "chrono", "clap", - "colored", + "colored 3.0.0", "cruet 0.13.3", + "dashmap", "duct", "duct_sh", "english-to-cron", "futures-util", "heck 0.4.1", - "hyper", "include_dir", "ipnetwork", "jsonwebtoken", @@ -2483,10 +2405,9 @@ dependencies = [ "loco-gen", "moka", "opendal", - "rand 0.8.5", + "rand 0.9.2", + "redis", "regex", - "reqwest", - "rusty-sidekiq", "scraper", "sea-orm", "sea-orm-migration", @@ -2498,7 +2419,6 @@ dependencies = [ "sqlx", "tera", "thiserror 1.0.69", - "thousands", "tokio", "tokio-cron-scheduler", "tokio-util", @@ -2508,6 +2428,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-subscriber", + "tree-fs", "ulid", "uuid", "validator", @@ -2561,12 +2482,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - [[package]] name = "lucene_query_builder" version = "0.3.0" @@ -2910,16 +2825,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.36.7" @@ -3473,61 +3378,6 @@ dependencies = [ "serde", ] -[[package]] -name = "quinn" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2 0.5.10", - "thiserror 2.0.12", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" -dependencies = [ - "bytes", - "getrandom 0.3.3", - "lru-slab", - "rand 0.9.2", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.12", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.5.10", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "quote" version = "1.0.40" @@ -3625,19 +3475,21 @@ dependencies = [ [[package]] name = "redis" -version = "0.22.3" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8455fa3621f6b41c514946de66ea0531f57ca017b2e6c7cc368035ea5b46df" +checksum = "0bc1ea653e0b2e097db3ebb5b7f678be339620b8041f66b30a308c1d45d36a7f" dependencies = [ - "async-trait", "bytes", + "cfg-if", "combine", "futures-util", "itoa", + "num-bigint", "percent-encoding", "pin-project-lite", "ryu", "sha1_smol", + "socket2 0.5.10", "tokio", "tokio-util", "url", @@ -3652,17 +3504,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "regex" version = "1.11.1" @@ -3747,8 +3588,6 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "quinn", - "rustls", "rustls-pki-types", "serde", "serde_json", @@ -3756,7 +3595,6 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls", "tokio-util", "tower 0.5.2", "tower-http", @@ -3766,7 +3604,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.2", ] [[package]] @@ -3927,12 +3764,6 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "rustc_version" version = "0.4.1" @@ -3976,7 +3807,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ - "web-time", "zeroize", ] @@ -3997,34 +3827,6 @@ version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" -[[package]] -name = "rusty-sidekiq" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15544f047600b602c7b11ff7ee0882f9034f9cbe2c205693edd5615e2a6c03ee" -dependencies = [ - "async-trait", - "bb8", - "chrono", - "convert_case", - "cron_clock", - "gethostname", - "hex", - "num_cpus", - "rand 0.8.5", - "redis", - "serde", - "serde_json", - "serial_test", - "sha2", - "slog-term", - "thiserror 1.0.69", - "tokio", - "tokio-util", - "tracing", - "tracing-subscriber", -] - [[package]] name = "ryu" version = "1.0.20" @@ -4486,6 +4288,12 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "shared_thread" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" + [[package]] name = "shlex" version = "1.3.0" @@ -4568,25 +4376,6 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" - -[[package]] -name = "slog-term" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" -dependencies = [ - "is-terminal", - "slog", - "term", - "thread_local", - "time", -] - [[package]] name = "slug" version = "0.1.6" @@ -5063,17 +4852,6 @@ dependencies = [ "unic-segment", ] -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -5114,12 +4892,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "thousands" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" - [[package]] name = "thread_local" version = "1.1.9" @@ -5196,7 +4968,6 @@ dependencies = [ "io-uring", "libc", "mio", - "parking_lot", "pin-project-lite", "signal-hook-registry", "slab", @@ -5471,6 +5242,16 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "tree-fs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6115680fa5fdb99b4ff19c9c3217e75116d2bb0eae82458c4e1818be6a10c7" +dependencies = [ + "rand 0.9.2", + "serde", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -5582,12 +5363,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - [[package]] name = "unicode-width" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 5834fd3..08abd02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,10 @@ default-run = "music_metadata_manager-cli" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [workspace.dependencies] -loco-rs = { version = "0.15" } +loco-rs = { version = "0.16.3" } [dependencies] -loco-rs = { workspace = true } +loco-rs = { workspace = true } serde = { version = "1", features = ["derive"] } serde_json = "1" tokio = { version = "1.33.0", default-features = false, features = [ diff --git a/src/models/users.rs b/src/models/users.rs index 715a508..c1678e5 100644 --- a/src/models/users.rs +++ b/src/models/users.rs @@ -27,7 +27,7 @@ pub struct RegisterParams { pub struct Validator { #[validate(length(min = 2, message = "Name must be at least 2 characters long."))] pub name: String, - #[validate(custom(function = "validation::is_valid_email"))] + #[validate(email(message = "invalid email"))] pub email: String, }