Skip to content

Commit b4926b7

Browse files
committed
Bump toolchain to 1.76.0
We also need to fix the sqlite-bundled job to the yesterday nightly due to rust-lang/rust#120830
1 parent dfeec4b commit b4926b7

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.github/workflows/ci.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -420,29 +420,30 @@ jobs:
420420
runs-on: ubuntu-latest
421421
steps:
422422
- uses: actions/checkout@v4
423-
- uses: dtolnay/rust-toolchain@nightly
423+
- uses: dtolnay/rust-toolchain@master
424424
with:
425+
toolchain: nightly-2024-02-08
425426
components: "rust-src"
426427
- name: Cache cargo registry
427428
uses: Swatinem/rust-cache@v2
428429
with:
429430
key: sqlite_bundled-cargo-${{ hashFiles('**/Cargo.toml') }}
430431

431432
- name: Test diesel-cli
432-
run: cargo +nightly test --manifest-path diesel_cli/Cargo.toml --no-default-features --features "sqlite-bundled"
433+
run: cargo +nightly-2024-02-08 test --manifest-path diesel_cli/Cargo.toml --no-default-features --features "sqlite-bundled"
433434

434435
- name: Run diesel_tests with ASAN enabled
435436
env:
436437
RUSTFLAGS: -Zsanitizer=address
437438
ASAN_OPTIONS: detect_stack_use_after_return=1
438-
run: cargo +nightly -Z build-std test --manifest-path diesel_tests/Cargo.toml --no-default-features --features "sqlite libsqlite3-sys libsqlite3-sys/bundled libsqlite3-sys/with-asan" --target x86_64-unknown-linux-gnu
439+
run: cargo +nightly-2024-02-08 -Z build-std test --manifest-path diesel_tests/Cargo.toml --no-default-features --features "sqlite libsqlite3-sys libsqlite3-sys/bundled libsqlite3-sys/with-asan" --target x86_64-unknown-linux-gnu
439440

440441
- name: Run diesel tests with ASAN enabled
441442
env:
442443
RUSTDOCFLAGS: -Zsanitizer=address
443444
RUSTFLAGS: -Zsanitizer=address
444445
ASAN_OPTIONS: detect_stack_use_after_return=1
445-
run: cargo +nightly -Z build-std test --manifest-path diesel/Cargo.toml --no-default-features --features "sqlite extras libsqlite3-sys libsqlite3-sys/bundled libsqlite3-sys/with-asan" --target x86_64-unknown-linux-gnu
446+
run: cargo +nightly-2024-02-08 -Z build-std test --manifest-path diesel/Cargo.toml --no-default-features --features "sqlite extras libsqlite3-sys libsqlite3-sys/bundled libsqlite3-sys/with-asan" --target x86_64-unknown-linux-gnu
446447

447448
minimal_rust_version:
448449
name: Check Minimal supported rust version (1.70.0)

.github/workflows/doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Publish documentation
4040
if: success()
41-
uses: JamesIves/github-pages-deploy-action@v4.2.5
41+
uses: JamesIves/github-pages-deploy-action@v4
4242
with:
4343
token: ${{ secrets.GITHUB_TOKEN }}
4444
branch: gh-pages # The branch the action should deploy to.

diesel/src/pg/types/json.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ impl ToSql<sql_types::Jsonb, Pg> for serde_json::Value {
4646
}
4747
}
4848

49-
#[cfg(tests)]
49+
#[cfg(test)]
5050
mod tests {
51-
use crate::query_builder::bind_types::ByteWrapper;
51+
use crate::deserialize::FromSql;
52+
use crate::pg::{Pg, PgValue};
53+
use crate::query_builder::bind_collector::ByteWrapper;
54+
use crate::serialize::{Output, ToSql};
55+
use crate::sql_types;
5256

5357
#[test]
5458
fn json_to_sql() {

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.75.0
1+
1.76.0

0 commit comments

Comments
 (0)