diff --git a/Cargo.lock b/Cargo.lock index b235c003..638aaf11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -656,15 +656,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -765,13 +756,11 @@ dependencies = [ "actix-web-static-files", "anyhow", "argon2", - "async-trait", "brass-config", "brass-macros", "built", "change-detection", "chrono", - "dotenv", "fake", "futures-util", "garde", @@ -787,7 +776,7 @@ dependencies = [ "serde_json", "sqlx", "static-files", - "thiserror 2.0.11", + "thiserror", "zxcvbn", ] @@ -845,16 +834,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "card-validate" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655fa70596e2a38372c0c0c4449ec0166ad9cc43d91558bbecc1a6f38bf9eb91" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "castaway" version = "0.2.3" @@ -983,7 +962,6 @@ dependencies = [ "itoa", "rustversion", "ryu", - "serde", "static_assertions", ] @@ -1261,12 +1239,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "dotenvy" version = "0.15.7" @@ -1386,7 +1358,7 @@ checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", "regex-automata", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] @@ -1575,17 +1547,9 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4bd1d7843e437a4caf1d6a9112ba1ee9635b09d909af22aa4e6ec01fe971e22" dependencies = [ - "card-validate", "compact_str", "garde_derive", - "idna", - "once_cell", - "phonenumber", - "regex", - "serde", "smallvec", - "unicode-segmentation", - "url", ] [[package]] @@ -1596,7 +1560,6 @@ checksum = "a0636cbdc03994db48fc89a0ce7765bd68d08bd8a7a68cb9a36bcde96790f413" dependencies = [ "proc-macro2", "quote", - "regex", "syn 2.0.96", ] @@ -2197,15 +2160,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "maud" version = "0.26.0" @@ -2365,12 +2319,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "oncemutex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" - [[package]] name = "opaque-debug" version = "0.3.1" @@ -2453,26 +2401,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "phonenumber" -version = "0.3.7+8.13.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2247167dc3741816fdd4d3690e97f56a892a264b44f4c702078b72d1f8b6bd40" -dependencies = [ - "bincode", - "either", - "fnv", - "nom", - "once_cell", - "quick-xml", - "regex", - "regex-cache", - "serde", - "serde_derive", - "strum", - "thiserror 1.0.69", -] - [[package]] name = "pico-args" version = "0.5.0" @@ -2701,7 +2629,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] @@ -2712,19 +2640,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-cache" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7b62d69743b8b94f353b6b7c3deb4c5582828328bcb8d5fedf214373808793" -dependencies = [ - "lru-cache", - "oncemutex", - "regex", - "regex-syntax 0.6.29", + "regex-syntax", ] [[package]] @@ -2733,12 +2649,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3132,7 +3042,7 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "thiserror 2.0.11", + "thiserror", "tracing", "url", "webpki-roots", @@ -3215,7 +3125,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.11", + "thiserror", "tracing", "whoami", ] @@ -3253,7 +3163,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.11", + "thiserror", "tracing", "whoami", ] @@ -3335,28 +3245,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.96", -] - [[package]] name = "subtle" version = "2.6.1" @@ -3410,33 +3298,13 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.11", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", + "thiserror-impl", ] [[package]] @@ -3607,12 +3475,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-xid" version = "0.2.6" diff --git a/web/Cargo.toml b/web/Cargo.toml index dd034a14..f1f728d4 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -12,7 +12,6 @@ actix-web = { version = "4" } serde = { version = "1.0.164", features = ["derive"] } argon2 = { version = "0.5.0", features = [ "std"]} anyhow = "1.0.71" -dotenv = "0.15.0" actix-session = { version = "0.10.1", features = ["cookie-session"] } actix-identity = "0.8.0" chrono = { version = "0.4.33", features = ["serde", "now"] } @@ -21,19 +20,17 @@ futures-util = "0.3.30" serde_json = "1.0.114" pico-args = "0.5.0" rand = { version = "0.8.5", features = ["getrandom"] } -async-trait = "0.1.79" lettre = { version = "0.11.11", default-features = false, features = ["builder", "smtp-transport", "async-std1-rustls-tls"] } quick-xml = { version = "0.37", features = ["serde", "serialize"] } actix-web-static-files = "4.0" static-files = "0.2.1" zxcvbn = "3.1.0" thiserror = "2" -regex = "1.11.1" brass-macros = { path = "../macros" } brass-config = { path = "../config" } actix-http = "3.9.0" rinja = "0.3.5" -garde = { version = "0.21.0", features = ["full"] } +garde = { version = "0.21.0", features = ["derive"] } maud = "0.26.0" [build-dependencies] @@ -44,3 +41,4 @@ change-detection = "1.2.0" [dev-dependencies] insta = { version = "1.41.1", features = ["yaml", "filters"] } fake = { version = "3.0.1", features = ["chrono"]} +regex = "1.11.1"