diff --git a/.github/workflows/aardwolf-build.yml b/.github/workflows/aardwolf-build.yml index 3e63f3db..0fe5688c 100644 --- a/.github/workflows/aardwolf-build.yml +++ b/.github/workflows/aardwolf-build.yml @@ -13,22 +13,25 @@ concurrency: cancel-in-progress: true jobs: - + cargo-build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4 # Marketplace - https://github.com/marketplace/actions/checkout # Installs the most recent stable rust toolchain as of the specified time # offset, which may be written in years, months, weeks, or days. - - uses: dtolnay/rust-toolchain@master + + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable components: rustfmt, clippy + - name: Cache dependencies - uses: actions/cache@v3.3.1 + uses: actions/cache@v4 with: path: ~/.cargo key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} @@ -68,4 +71,4 @@ jobs: # Run cargo build - name: Cargo build aardwolf - run: cargo build \ No newline at end of file + run: cargo build diff --git a/.github/workflows/aardwolf-test.yml b/.github/workflows/aardwolf-test.yml index 0bac755e..1ac23617 100644 --- a/.github/workflows/aardwolf-test.yml +++ b/.github/workflows/aardwolf-test.yml @@ -14,13 +14,13 @@ jobs: runs-on: ubuntu-latest steps: # Checkout the originating branch - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.workflow_run.head_branch }} # Cache dependencies - name: Cache dependencies - uses: actions/cache@v3.3.1 + uses: actions/cache@v4 with: path: ~/.cargo key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml index c4d240e3..3d2d5c65 100644 --- a/.github/workflows/rust-clippy.yml +++ b/.github/workflows/rust-clippy.yml @@ -29,13 +29,11 @@ jobs: - name: Checkout code uses: actions/checkout@v4 # Marketplace - https://github.com/marketplace/actions/checkout - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 # Marketplace - https://github.com/marketplace/actions/rust-toolchain + - name: Install rust toolchain + uses: dtolnay/rust-toolchain@master # Marketplace - https://github.com/marketplace/actions/rustup-toolchain-install with: - profile: minimal toolchain: stable - components: clippy - override: true + components: rustfmt, clippy - name: Install required cargo run: cargo install clippy-sarif sarif-fmt diff --git a/Cargo.lock b/Cargo.lock index 3cda62fd..7c21b4d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,7 +12,7 @@ dependencies = [ "clap-verbosity-flag", "config", "log", - "rust-i18n", + "rust-i18n 2.2.1", "simple-logging", "syslog", "systemd", @@ -48,7 +48,7 @@ dependencies = [ name = "aardwolf-localization" version = "0.1.0" dependencies = [ - "rust-i18n", + "rust-i18n 3.0.1", ] [[package]] @@ -126,7 +126,7 @@ version = "0.1.0" dependencies = [ "aardwolf-localization", "log", - "rust-i18n", + "rust-i18n 2.2.1", "serde", "serde_json", "wasm-bindgen", @@ -302,15 +302,14 @@ dependencies = [ [[package]] name = "actix-session" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da8b818ae1f11049a4d218975345fe8e56ce5a5f92c11f972abcff5ff80e87" +checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2" dependencies = [ "actix-service", "actix-utils", "actix-web", "anyhow", - "async-trait", "derive_more", "serde", "serde_json", @@ -521,17 +520,32 @@ dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", - "anstyle-wincon", + "anstyle-wincon 1.0.1", "colorchoice", "is-terminal", "utf8parse", ] +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 3.0.3", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" @@ -548,7 +562,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -558,7 +572,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", ] [[package]] @@ -573,6 +597,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "arrayvec" version = "0.5.2" @@ -819,9 +849,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -830,9 +860,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -891,7 +921,7 @@ version = "4.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "bitflags 1.3.2", "clap_lex", @@ -904,7 +934,7 @@ version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.25", @@ -1050,9 +1080,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1060,58 +1090,58 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 1.0.109", + "strsim 0.11.1", + "syn 2.0.25", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] @@ -1267,17 +1297,27 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream 0.6.14", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1294,7 +1334,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1790,6 +1830,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1982,9 +2028,15 @@ checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi 0.3.1", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -2113,9 +2165,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", ] @@ -2184,7 +2236,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2216,7 +2268,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2336,7 +2388,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -2566,9 +2618,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2592,9 +2644,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2731,13 +2783,27 @@ dependencies = [ "quote", "regex", "rust-i18n-extract", - "rust-i18n-macro", - "rust-i18n-support", + "rust-i18n-macro 2.1.0", + "rust-i18n-support 2.1.0", "serde", "serde_derive", "toml 0.7.6", ] +[[package]] +name = "rust-i18n" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcd94370631e5658a0a23635f7f47e43d06a00ad948e0bb5de79b00d85b880c" +dependencies = [ + "globwalk", + "once_cell", + "regex", + "rust-i18n-macro 3.0.0", + "rust-i18n-support 3.0.1", + "smallvec", +] + [[package]] name = "rust-i18n-extract" version = "2.1.0" @@ -2749,7 +2815,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rust-i18n-support", + "rust-i18n-support 2.1.0", "serde", "serde_json", "serde_yaml", @@ -2767,7 +2833,24 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "rust-i18n-support", + "rust-i18n-support 2.1.0", + "serde", + "serde_json", + "serde_yaml", + "syn 2.0.25", +] + +[[package]] +name = "rust-i18n-macro" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355763801dcf287e777e42def7c578410783477b804b1107852119e0b2518396" +dependencies = [ + "glob", + "once_cell", + "proc-macro2", + "quote", + "rust-i18n-support 3.0.1", "serde", "serde_json", "serde_yaml", @@ -2792,6 +2875,26 @@ dependencies = [ "toml 0.7.6", ] +[[package]] +name = "rust-i18n-support" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399801f4d955abf1c3ce3ce2215dc76bd40beb4ae39e3a84936b21a79ce2caa5" +dependencies = [ + "arc-swap", + "globwalk", + "lazy_static", + "normpath", + "once_cell", + "proc-macro2", + "regex", + "serde", + "serde_json", + "serde_yaml", + "toml 0.7.6", + "triomphe", +] + [[package]] name = "rust-ini" version = "0.18.0" @@ -2827,7 +2930,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3006,9 +3109,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -3020,6 +3123,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3038,19 +3147,25 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -3119,15 +3234,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -3248,7 +3354,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3352,6 +3458,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "triomphe" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +dependencies = [ + "arc-swap", + "serde", + "stable_deref_trait", +] + [[package]] name = "typenum" version = "1.16.0" @@ -3627,7 +3744,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -3636,7 +3753,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -3645,13 +3771,29 @@ version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3660,42 +3802,90 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" version = "0.5.4" diff --git a/aardwolf-actix/Cargo.toml b/aardwolf-actix/Cargo.toml index 1b386d00..6d203512 100644 --- a/aardwolf-actix/Cargo.toml +++ b/aardwolf-actix/Cargo.toml @@ -31,7 +31,7 @@ version = "0.1" path = "../aardwolf-types" [dependencies.actix-session] -version = "0.7" +version = "0.9.0" features = ["cookie-session"] [dependencies.diesel] @@ -40,7 +40,7 @@ default-features = false features = ["postgres", "uuid", "chrono"] [dependencies.rocket_i18n] -rocket_i18n = "0.4" +version = "0.4.1" default-features = false [dependencies.futures] diff --git a/aardwolf-localization/Cargo.toml b/aardwolf-localization/Cargo.toml index 86cc513c..0698d767 100644 --- a/aardwolf-localization/Cargo.toml +++ b/aardwolf-localization/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rust-i18n = "2.1.0" +rust-i18n = "3.0.1" diff --git a/aardwolf-models/Cargo.toml b/aardwolf-models/Cargo.toml index 138e21e0..b4947004 100644 --- a/aardwolf-models/Cargo.toml +++ b/aardwolf-models/Cargo.toml @@ -9,15 +9,15 @@ edition = "2021" anyhow = "1.0" bcrypt = "0.15.0" chrono = "0.4.26" -chrono-tz = "0.8" +chrono-tz = "0.9.0" log = "0.4" mime = "0.3" openssl = "0.10" rand = "0.8.5" serde = "1.0" serde_json = "1.0" -strum = "0.25.0" -strum_macros = "0.25.1" +strum = "0.26.3" +strum_macros = "0.26.4" thiserror = "1.0" url = "2.1" dotenvy ="0.15" @@ -36,5 +36,5 @@ version = "2.1" features = ["chrono", "postgres", "serde_json", "uuid"] [dev-dependencies] -env_logger = "0.10" +env_logger = "0.11.3" serde_derive = "1.0" \ No newline at end of file diff --git a/aardwolf-models/src/sql_types/timezone.rs b/aardwolf-models/src/sql_types/timezone.rs index b69926b9..02bd83dc 100644 --- a/aardwolf-models/src/sql_types/timezone.rs +++ b/aardwolf-models/src/sql_types/timezone.rs @@ -19,7 +19,7 @@ impl FromStr for Timezone { fn from_str(s: &str) -> Result { FromStr::from_str(s) .map(Timezone) - .map_err(TimezoneParseError) + .map_err(|err| TimezoneParseError(err.to_string())) } } diff --git a/aardwolf-templates/Cargo.toml b/aardwolf-templates/Cargo.toml index a786511d..12de0e19 100644 --- a/aardwolf-templates/Cargo.toml +++ b/aardwolf-templates/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" build = "build.rs" [build-dependencies] -config = "0.13" +config = "0.14.0" ructe = "0.13" [dependencies] @@ -15,7 +15,7 @@ gettext-macros = "0.6.1" gettext-utils = "0.1.0" [dependencies.rocket_i18n] -rocket_i18n = "0.4" +version = "0.4.1" default-features = false [dependencies.aardwolf-types] diff --git a/aardwolf-templates/src/home/feed.rs b/aardwolf-templates/src/home/feed.rs index 806151d4..6e2cb870 100644 --- a/aardwolf-templates/src/home/feed.rs +++ b/aardwolf-templates/src/home/feed.rs @@ -12,8 +12,9 @@ impl<'a> Feed<'a> { } } + impl<'a> Renderable for Feed<'a> { - fn render(&self, write: &mut dyn std::io::Write) -> std::io::Result<()> { - crate::templates::home::feed(write, self) + fn render(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> { + crate::templates::home::feed(writer, self) } } diff --git a/aardwolf-templates/src/lib.rs b/aardwolf-templates/src/lib.rs index ed6162a3..64c2ffbe 100644 --- a/aardwolf-templates/src/lib.rs +++ b/aardwolf-templates/src/lib.rs @@ -35,7 +35,8 @@ pub trait Renderable { fn render(&self, _: &mut dyn std::io::Write) -> std::io::Result<()>; } +/// Returns an empty Translations object to disable translations due to issues with the gettext library. pub fn managed_state() -> Translations { - // `gettext` is not behaving correctly, so we're disabling translations until we can replace it + // gettext is not behaving correctly, so translations are disabled until a replacement is found Vec::new() } diff --git a/aardwolf-types/Cargo.toml b/aardwolf-types/Cargo.toml index db8cd964..3801d8e4 100644 --- a/aardwolf-types/Cargo.toml +++ b/aardwolf-types/Cargo.toml @@ -10,7 +10,7 @@ with-actix = ["actix-web", "futures", "r2d2"] [dependencies] anyhow = "1.0" -derive_builder = "0.12.0" +derive_builder = "0.20.0" log = "0.4" openssl = "0.10" mime = "0.3" diff --git a/src/lib.rs b/src/lib.rs index dd3b1eac..808f3e5a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ use std::env; use anyhow::{Context, Result}; use clap::Parser; use clap_verbosity_flag::Verbosity; -use config::{Config, ConfigError, Environment}; +use config::{Config, Environment}; #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)]