Merge pull request #3931 from weiznich/bump/1.76

Bump toolchain to 1.76.0
diesel-rs · Feb 19, 2024 · 7c4ba73 · 7c4ba73
2 parents dfeec4b + 3ef9a7b
commit 7c4ba73
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -420,8 +420,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: nightly
           components: "rust-src"
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -38,7 +38,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
@@ -46,9 +46,13 @@ impl ToSql<sql_types::Jsonb, Pg> 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
@@ -1 +1 @@
-1.75.0
+1.76.0