Merge branch 'master' into arangodb

.devcontainer/Dockerfile

@@ -1,9 +1,14 @@
-# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye, bookworm
-ARG VARIANT="bookworm"
-FROM mcr.microsoft.com/devcontainers/rust:1-${VARIANT}
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
 
 # Include lld linker to improve build times either by using environment variable
 # RUSTFLAGS="-C link-arg=-fuse-ld=lld" or with Cargo's configuration file (i.e see .cargo/config.toml).
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-   && apt-get -y install clang lld \
+   && apt-get -y install clang lld libsqlite3-dev libmariadb-dev-compat libmariadb-dev libpq-dev pkg-config \
    && apt-get autoremove -y && apt-get clean -y
+
+USER vscode
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.75 --no-modify-path -y
+
+RUN /home/vscode/.cargo/bin/cargo install cargo-release
+RUN /home/vscode/.cargo/bin/cargo install --locked cargo-outdated

.devcontainer/devcontainer.json

@@ -5,7 +5,6 @@
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspace",
-
   // Configure tool-specific properties.
   "customizations": {
     // Configure properties specific to VS Code.
@@ -19,25 +18,24 @@
         },
         "rust-analyzer.checkOnSave.command": "clippy"
       },
-
       // Add the IDs of extensions you want installed when the container is created.
       "extensions": [
-		"vadimcn.vscode-lldb",
-		"mutantdino.resourcemonitor",
-		"rust-lang.rust-analyzer",
-		"tamasfe.even-better-toml",
-		"serayuzgur.crates",
-		"ms-azuretools.vscode-docker"
-	]
+        "vadimcn.vscode-lldb",
+        "mutantdino.resourcemonitor",
+        "rust-lang.rust-analyzer",
+        "tamasfe.even-better-toml",
+        "serayuzgur.crates",
+        "ms-azuretools.vscode-docker"
+      ]
     }
   },
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [5432],
-
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "rustc --version",
-
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode"
-}
+  "remoteUser": "vscode",
+  "remoteEnv": {
+    "PATH": "${containerEnv:PATH}:/home/vscode/.cargo/bin"
+  }
+}

.devcontainer/docker-compose.yml

@@ -41,7 +41,7 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
   postgres:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data

.github/workflows/ci.yml

@@ -30,7 +30,6 @@ jobs:
           - deadpool-postgres
           - deadpool-r2d2
           - deadpool-redis
-          - deadpool-redis-cluster
           - deadpool-sqlite
           # Examples
           - example-postgres-actix-web
@@ -102,7 +101,6 @@ jobs:
           - lapin
           - postgres
           - redis
-          - redis-cluster
           - sqlite
         feature:
           - rt_tokio_1
@@ -131,22 +129,45 @@ jobs:
       - run: cargo check -p deadpool-${{ matrix.crate }}
                    --features ${{ matrix.feature }}
 
+  check-integration-wasm:
+    name: Check integration (WebAssembly)
+    strategy:
+      fail-fast: false
+      matrix:
+        crate:
+          - postgres
+        feature:
+          - --features rt_tokio_1
+          - --features serde --features rt_tokio_1
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - run: cargo check -p deadpool-${{ matrix.crate }}
+                   --no-default-features
+                   ${{ matrix.feature }}
+                   --target wasm32-unknown-unknown
+
   msrv:
     name: MSRV
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { crate: deadpool-runtime, msrv: '1.63.0' }
-          - { crate: deadpool-sync, msrv: '1.63.0' }
-          - { crate: deadpool, msrv: '1.63.0' }
-          - { crate: deadpool-arangodb, msrv: '1.63.0' }
-          - { crate: deadpool-diesel, msrv: '1.63.0' }
-          - { crate: deadpool-lapin, msrv: '1.63.0' }
-          - { crate: deadpool-postgres, msrv: '1.63.0' }
-          - { crate: deadpool-redis, msrv: '1.63.0' }
-          - { crate: deadpool-redis-cluster, msrv: '1.63.0' }
-          - { crate: deadpool-sqlite, msrv: '1.63.0' }
+          - { crate: deadpool-runtime, msrv: '1.75.0' }
+          - { crate: deadpool-sync, msrv: '1.75.0' }
+          - { crate: deadpool, msrv: '1.75.0' }
+          - { crate: deadpool-arangodb, msrv: '1.75.0' }
+          - { crate: deadpool-diesel, msrv: '1.78.0' }
+          - { crate: deadpool-lapin, msrv: '1.75.0' }
+          - { crate: deadpool-postgres, msrv: '1.75.0' }
+          - { crate: deadpool-redis, msrv: '1.75.0' }
+          - { crate: deadpool-sqlite, msrv: '1.75.0' }
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -177,7 +198,6 @@ jobs:
           - deadpool-lapin
           - deadpool-postgres
           - deadpool-redis
-          - deadpool-redis-cluster
           - deadpool-sqlite
     runs-on: ubuntu-latest
     services:
@@ -260,7 +280,6 @@ jobs:
           - deadpool-lapin
           - deadpool-postgres
           - deadpool-redis
-          - deadpool-redis-cluster
           - deadpool-sqlite
     runs-on: ubuntu-latest
     steps: