Merge pull request #4823 from weiznich/prepare/2.3.3

Prepare/2.3.3

Author: weiznich

.github/dependabot.yml

@@ -1,5 +1,16 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    reviewers:
+      - "diesel/reviewers"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "rust-toolchain"
+    reviewers:
+      - "diesel/reviewers"
+    schedule:
+      interval: "weekly"
+      day: "friday" # rust releases are on thursdays
   - package-ecosystem: "cargo"
     directory: "/"
     allow:

.github/workflows/audit.yml

@@ -14,7 +14,7 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/audit@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v5
+      - run: |
+          cargo install cargo-deny --locked
+          cargo deny check

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches:
-      - master
+      - main
       - "0.[0-9]+.x"
       - "1.[0-9]+.x"
       - "2.[0-9]+.x"
@@ -30,7 +30,14 @@ jobs:
       matrix:
         rust: ["stable"]
         backend: ["postgres", "sqlite", "mysql"]
-        os: [ubuntu-latest, macos-13, macos-15, windows-2025, ubuntu-22.04-arm]
+        os:
+          [
+            ubuntu-latest,
+            macos-15-intel,
+            macos-15,
+            windows-2025,
+            ubuntu-24.04-arm,
+          ]
         include:
           - rust: "beta"
             backend: "postgres"
@@ -53,7 +60,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
@@ -64,7 +71,6 @@ jobs:
         shell: bash
         if: matrix.rust == 'nightly'
         run: |
-          echo "RUSTFLAGS=--cfg doc_cfg" >> $GITHUB_ENV
           echo "RUSTDOCFLAGS=--cfg doc_cfg" >> $GITHUB_ENV
 
       - name: Set environment variables
@@ -104,7 +110,7 @@ jobs:
           echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root:[email protected]/diesel_unit_test" >> $GITHUB_ENV
 
       - name: Install postgres (MacOS)
-        if: (matrix.os == 'macos-13' || matrix.os == 'macos-15') && matrix.backend == 'postgres'
+        if: runner.os == 'macOS' && matrix.backend == 'postgres'
         run: |
           brew update
           brew install postgresql@14
@@ -120,8 +126,8 @@ jobs:
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install sqlite
           echo "SQLITE_DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV
 
-      - name: Install mysql (MacOS)
-        if: matrix.os == 'macos-13' && matrix.backend == 'mysql'
+      - name: Install mysql (MacOS Intel)
+        if: matrix.os == 'macos-15-intel' && matrix.backend == 'mysql'
         run: |
           brew install [email protected]
           /usr/local/opt/[email protected]/bin/mysql.server start
@@ -265,7 +271,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
@@ -287,7 +293,7 @@ jobs:
     name: Check rustfmt style && run clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy, rustfmt
@@ -326,7 +332,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: "rust-src"
@@ -360,10 +366,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
-          components: "rust-src"
+          components: "rust-src, rustfmt"
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
         with:
@@ -392,10 +398,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
-          components: "rust-src"
+          components: "rust-src, rustfmt"
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
         with:
@@ -435,10 +441,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
-          components: "rust-src"
+          components: "rust-src, rustfmt"
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
         with:
@@ -489,7 +495,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/[email protected]
       - uses: dtolnay/rust-toolchain@nightly
       - uses: taiki-e/install-action@cargo-hack
@@ -518,7 +524,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [rustfmt_and_clippy]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@v2
         with:

.github/workflows/doc.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - master
+      - main
       - "0.[0-9]+.x"
       - "1.[0-9]+.x"
       - "2.[0-9]+.x"
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
         with:
@@ -35,8 +35,8 @@ jobs:
           sudo apt-get -y install libmysqlclient-dev libsqlite3-dev libpq-dev libtirpc-dev
       - name: Build documentation
         env:
-          RUSTFLAGS: "--cfg docsrs"
-          RUSTDOCFLAGS: "--cfg docsrs  -Z unstable-options --generate-link-to-definition"
+          RUSTFLAGS: "--cfg diesel_docsrs"
+          RUSTDOCFLAGS: "--cfg diesel_docsrs  -Z unstable-options --generate-link-to-definition --generate-macro-expansion"
         run: cargo +nightly doc --manifest-path diesel/Cargo.toml --features "postgres sqlite mysql extras i-implement-a-third-party-backend-and-opt-into-breaking-changes" --workspace
 
       - name: Publish documentation

.github/workflows/metrics.yml

@@ -21,7 +21,7 @@ jobs:
         backend: ["postgres", "sqlite", "mysql"]
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: cache
         uses: Swatinem/rust-cache@v2
         with:

.github/workflows/release.yml

@@ -15,7 +15,9 @@
 
 name: Release
 permissions:
+  "attestations": "write"
   "contents": "write"
+  "id-token": "write"
 
 # This task will run whenever you push a git tag that looks like a version
 # like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc.
@@ -64,7 +66,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.29.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
       - name: Cache dist
         uses: actions/upload-artifact@v4
         with:
@@ -144,6 +146,10 @@ jobs:
           # Actually do builds and make zips and whatnot
           dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
           echo "dist ran successfully"
+      - name: Attest
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*"
       - id: cargo-dist
         name: Post-build
         # We force bash here just because github makes it really hard to get values up

.github/workflows/run_benches.yml

@@ -16,7 +16,7 @@ jobs:
         backend: ["postgres", "sqlite", "mysql"]
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install postgres (Linux)
         if: matrix.backend == 'postgres'
@@ -73,7 +73,7 @@ jobs:
           path: ./pr_${{ matrix.backend }}.txt
 
       - name: Checkout base branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.base.sha }}
           repository: ${{ github.event.pull_request.base.repo.full_name }}

CHANGELOG.md

@@ -12,6 +12,15 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 
 ## Unreleased
 
+## [2.3.3] 2025-10-24
+
+### Fixed 
+
+* Fix displaying binds in instrumentations for `#[derive(MultiConnection)]`
+* Support artifact attestation for binaries build for releases
+* Stop using absolute paths in generated diesel.toml
+* Explicitly qualify `Ok` in code generated by derives to avoid naming conflicts
+
 ## [2.3.2] 2025-09-19
 
 ### Fixed
@@ -225,7 +234,7 @@ in a way that makes the pools suitable for use in parallel tests.
 
 ## Fixed
 
-* Fixed another potential breaking chaneg around queries containing `DISTINCT ON` and `ORDER BY` clauses consisting of custom sql expressions (e.g. `.nullable()`)
+* Fixed another potential breaking change around queries containing `DISTINCT ON` and `ORDER BY` clauses consisting of custom sql expressions (e.g. `.nullable()`)
 * Fixed an issue where `#[derive(Selectable)]` and `#[diesel(check_for_backend)]` generates invalid rust code if the struct contains lifetimes/generic types
 
 ## [2.1.1] 2023-08-25
@@ -2282,3 +2291,4 @@ queries or set `PIPES_AS_CONCAT` manually.
 [2.2.12]: https://github.com/diesel-rs/diesel/compare/v2.2.11...v2.2.12
 [2.3.0]: https://github.com/diesel-rs/diesel/compare/v2.2.0...v2.3.0
 [2.3.2]: https://github.com/diesel-rs/diesel/compare/v2.3.0...v2.3.2
+[2.3.3]: https://github.com/diesel-rs/diesel/compare/v2.3.3...v2.3.3

Cargo.toml

@@ -52,6 +52,9 @@ opt-level = 3
 [profile.dev.package.similar]
 opt-level = 3
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(diesel_docsrs)'] }
+
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"

diesel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel"
-version = "2.3.2"
+version = "2.3.3"
 license = "MIT OR Apache-2.0"
 description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL"
 readme = "README.md"
@@ -107,5 +107,8 @@ __with_asan_tests = [
 [package.metadata.docs.rs]
 features = ["postgres", "mysql", "sqlite", "extras"]
 no-default-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs", "-Z", "unstable-options", "--generate-link-to-definition"]
+rustc-args = ["--cfg", "diesel_docs"]
+rustdoc-args = ["--cfg", "diesel_docsrs", "-Z", "unstable-options", "--generate-link-to-definition", "--generate-macro-expansion"]
+
+[lints]
+workspace = true