From 038f0966a859ab864704b1a5c95e1a1e0df24108 Mon Sep 17 00:00:00 2001 From: tottoto Date: Sat, 13 Sep 2025 00:03:33 +0900 Subject: [PATCH] examples: Update to diesel-async 0.6 (#3470) --- Cargo.lock | 13 ++++++------- examples/diesel-async-postgres/Cargo.toml | 3 +-- examples/diesel-async-postgres/src/main.rs | 9 ++++----- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4b85180..f7a42684 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,13 +1103,13 @@ dependencies = [ [[package]] name = "diesel-async" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a307ac00f7c23f526a04a77761a0519b9f0eb2838ebf5b905a58580095bdcb" +checksum = "7fcc26599f590c7e5b182a05061cfb445f216bb069df72eb31f38cffde8ca598" dependencies = [ - "async-trait", - "bb8 0.8.6", + "bb8 0.9.0", "diesel", + "futures-core", "futures-util", "scoped-futures", "tokio", @@ -1404,7 +1404,6 @@ name = "example-diesel-async-postgres" version = "0.1.0" dependencies = [ "axum", - "bb8 0.8.6", "diesel", "diesel-async", "serde", @@ -2854,7 +2853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5594,7 +5593,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/examples/diesel-async-postgres/Cargo.toml b/examples/diesel-async-postgres/Cargo.toml index efec3440..8c078fdd 100644 --- a/examples/diesel-async-postgres/Cargo.toml +++ b/examples/diesel-async-postgres/Cargo.toml @@ -6,9 +6,8 @@ publish = false [dependencies] axum = { path = "../../axum", features = ["macros"] } -bb8 = "0.8" diesel = "2" -diesel-async = { version = "0.5", features = ["postgres", "bb8"] } +diesel-async = { version = "0.6", features = ["postgres", "bb8"] } serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.0", features = ["full"] } tracing = "0.1" diff --git a/examples/diesel-async-postgres/src/main.rs b/examples/diesel-async-postgres/src/main.rs index 44fbb546..0cc1d28b 100644 --- a/examples/diesel-async-postgres/src/main.rs +++ b/examples/diesel-async-postgres/src/main.rs @@ -21,7 +21,8 @@ use axum::{ }; use diesel::prelude::*; use diesel_async::{ - pooled_connection::AsyncDieselConnectionManager, AsyncPgConnection, RunQueryDsl, + pooled_connection::{bb8, AsyncDieselConnectionManager}, + AsyncPgConnection, RunQueryDsl, }; use std::net::SocketAddr; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; @@ -49,7 +50,7 @@ struct NewUser { hair_color: Option, } -type Pool = bb8::Pool>; +type Pool = bb8::Pool; #[tokio::main] async fn main() { @@ -97,9 +98,7 @@ async fn create_user( // we can also write a custom extractor that grabs a connection from the pool // which setup is appropriate depends on your application -struct DatabaseConnection( - bb8::PooledConnection<'static, AsyncDieselConnectionManager>, -); +struct DatabaseConnection(bb8::PooledConnection<'static, AsyncPgConnection>); impl FromRequestParts for DatabaseConnection where