From ddc50de977c5fbe1d7fd32d040ba81ade36a6521 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Fri, 9 Feb 2024 11:39:04 +0100 Subject: [PATCH] Bump toolchain to 1.76.0 We also need to fix the sqlite-bundled job to the yesterday nightly due to https://github.com/rust-lang/rust/issues/120830 --- .github/workflows/doc.yml | 2 +- diesel/src/pg/types/json.rs | 8 ++++++-- rust-toolchain | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index e54b45f7967e..3581b56f0420 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -41,7 +41,7 @@ jobs: - name: Publish documentation if: success() - uses: JamesIves/github-pages-deploy-action@v4.2.5 + uses: JamesIves/github-pages-deploy-action@v4 with: token: ${{ secrets.GITHUB_TOKEN }} branch: gh-pages # The branch the action should deploy to. diff --git a/diesel/src/pg/types/json.rs b/diesel/src/pg/types/json.rs index 059c86341ae6..9f43addf5e2e 100644 --- a/diesel/src/pg/types/json.rs +++ b/diesel/src/pg/types/json.rs @@ -46,9 +46,13 @@ impl ToSql for serde_json::Value { } } -#[cfg(tests)] +#[cfg(test)] mod tests { - use crate::query_builder::bind_types::ByteWrapper; + use crate::deserialize::FromSql; + use crate::pg::{Pg, PgValue}; + use crate::query_builder::bind_collector::ByteWrapper; + use crate::serialize::{Output, ToSql}; + use crate::sql_types; #[test] fn json_to_sql() { diff --git a/rust-toolchain b/rust-toolchain index dc87e8af82f6..32a6ce3c719b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.74.0 +1.76.0