From 62d4a72f40273741798f81406e348819f9ad0aaa Mon Sep 17 00:00:00 2001 From: guenhter Date: Fri, 23 Aug 2024 11:24:25 +0200 Subject: [PATCH] Not enable the rustls feature by default for sqlx DB's like sqlite not need the tls feature with sqlx at all. When cross compiling e.g. to i586, ring is not supported and therefore the db-pool cannot be used because the rustls feature is turned on by default even though not needed. --- contrib/db_pools/lib/Cargo.toml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/db_pools/lib/Cargo.toml b/contrib/db_pools/lib/Cargo.toml index 26541399..2fd125ca 100644 --- a/contrib/db_pools/lib/Cargo.toml +++ b/contrib/db_pools/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rocket_db_pools" -version = "0.1.0" +version = "0.2.1" authors = ["Sergio Benitez ", "Jeb Rosen "] description = "Rocket async database pooling support" repository = "https://github.com/rwf2/Rocket/tree/master/contrib/db_pools" @@ -26,8 +26,18 @@ sqlx_postgres = ["sqlx", "sqlx/postgres", "log"] sqlx_sqlite = ["sqlx", "sqlx/sqlite", "log"] sqlx_macros = ["sqlx/macros"] # diesel features -diesel_postgres = ["diesel-async/postgres", "diesel-async/deadpool", "deadpool", "diesel"] -diesel_mysql = ["diesel-async/mysql", "diesel-async/deadpool", "deadpool", "diesel"] +diesel_postgres = [ + "diesel-async/postgres", + "diesel-async/deadpool", + "deadpool", + "diesel", +] +diesel_mysql = [ + "diesel-async/mysql", + "diesel-async/deadpool", + "deadpool", + "diesel", +] # implicit features: mongodb [dependencies.rocket] @@ -77,7 +87,7 @@ optional = true [dependencies.sqlx] version = "0.8" default-features = false -features = ["runtime-tokio-rustls"] +features = ["runtime-tokio"] optional = true [dependencies.log]