Merge branch 'rolling' into optimize-and-make-code-idiomatic

.github/workflows/rust.yml

@@ -4,10 +4,10 @@ name: Rust
 on:
   push:
     branches:
-      - "**"
+      - '**'
   pull_request:
     branches:
-      - "rolling" 
+      - 'rolling'
 
 env:
   CARGO_TERM_COLOR: always
@@ -21,23 +21,26 @@ jobs:
           - stable
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: leafo/gh-actions-lua@v10
-    - run: rustup toolchain install stable --profile minimal
+        with:
-    - uses: Swatinem/rust-cache@v2
+          luaVersion: 'luajit'
-      with:
+      - uses: actions/checkout@v3
-        prefix-key: ""
+      - run: rustup toolchain install stable --profile minimal
-        shared-key: ""
+      - uses: Swatinem/rust-cache@v2
-        key: ""
+        with:
-        env-vars: ""
+          prefix-key: ''
-        workspaces: ""
+          shared-key: ''
-        cache-directories: ""
+          key: ''
-        cache-targets: ""
+          env-vars: ''
-        cache-on-failure: ""
+          workspaces: ''
-        cache-all-crates: ""
+          cache-directories: ''
-        save-if: ""    
+          cache-targets: ''
-    - uses: actions/checkout@v3
+          cache-on-failure: ''
-    - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+          cache-all-crates: ''
-    - name: Build
+          save-if: ''
-      run: cargo build --verbose
+      - uses: actions/checkout@v3
-    - name: Run tests
+      - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
-      run: cargo test --verbose
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose

.github/workflows/rust_format.yml

@@ -13,6 +13,9 @@ jobs:
     name: Rust project
     runs-on: ubuntu-latest
     steps:
+      - uses: leafo/gh-actions-lua@v10
+        with:
+          luaVersion: 'luajit'
       - uses: actions/checkout@v2
       - name: Install minimal stable with clippy and rustfmt
         uses: actions-rs/toolchain@v1

Cargo.lock

@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.3.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74"
+checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
 dependencies = [
  "actix-codec",
  "actix-rt",
@@ -69,7 +69,7 @@ dependencies = [
  "actix-utils",
  "ahash 0.8.3",
  "base64 0.21.3",
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "brotli",
  "bytes 1.4.0",
  "bytestring",
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.3.1"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96"
+checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -182,7 +182,7 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web-codegen",
- "ahash 0.7.6",
+ "ahash",
  "bytes 1.4.0",
  "bytestring",
  "cfg-if 1.0.0",
@@ -191,7 +191,6 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "http 0.2.9",
  "itoa 1.0.9",
  "language-tags",
  "log",
@@ -203,21 +202,21 @@ dependencies = [
  "serde_json",
  "serde_urlencoded 0.7.1",
  "smallvec 1.11.0",
- "socket2 0.4.9",
+ "socket2 0.5.3",
  "time 0.3.28",
- "url 2.4.0",
+ "url 2.4.1",
 ]
 
 [[package]]
 name = "actix-web-codegen"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9"
+checksum = "8cc9afd177d10afc1e7842eaf6b8b24a38f4d22088b197a2b9395b102c4413eb"
 dependencies = [
  "actix-router",
  "proc-macro2 1.0.66",
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -235,17 +234,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -544,18 +532,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
+checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
+checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -941,9 +929,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -1735,9 +1723,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae"
 
 [[package]]
 name = "memoffset"
@@ -2315,7 +2303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
 dependencies = [
  "idna 0.2.3",
- "url 2.4.0",
+ "url 2.4.1",
 ]
 
 [[package]]
@@ -2524,7 +2512,7 @@ dependencies = [
  "tokio 1.32.0",
  "tokio-retry",
  "tokio-util",
- "url 2.4.0",
+ "url 2.4.1",
 ]
 
 [[package]]
@@ -2635,7 +2623,7 @@ dependencies = [
  "tokio 1.32.0",
  "tokio-native-tls",
  "tower-service",
- "url 2.4.0",
+ "url 2.4.1",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -2674,9 +2662,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.9"
+version = "0.38.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
+checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2733,7 +2721,7 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c95a930e03325234c18c7071fd2b60118307e025d6fff3e12745ffbf63a3d29c"
 dependencies = [
- "ahash 0.8.3",
+ "ahash",
  "cssparser",
  "ego-tree",
  "getopts",
@@ -3552,9 +3540,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna 0.4.0",

Cargo.toml

@@ -12,7 +12,7 @@ tokio = {version="1.32.0",features=["rt-multi-thread","macros"]}
 serde = {version="1.0.188",features=["derive"]}
 handlebars = { version = "4.3.7", features = ["dir_source"] }
 scraper = {version="0.17.1"}
-actix-web = {version="4.3.1", features = ["cookies"]}
+actix-web = {version="4.4.0", features = ["cookies"]}
 actix-files = {version="0.6.2"}
 actix-cors = {version="0.6.4"}
 serde_json = {version="1.0.105"}