downgrade rand

lovasoa · lovasoa · commit 5f0b1fc629c4 · 2025-03-05T11:08:27.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -143,7 +143,7 @@ paste = "1.0.6"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 url = "2.2.2"
-rand = "0.9"
+rand = "0.8"
 rand_xoshiro = "0.7.0"
 hex = "0.4.3"
 tempdir = "0.3.7"
diff --git a/examples/postgres/axum-social-with-tests/Cargo.toml b/examples/postgres/axum-social-with-tests/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] }
 
 # Important secondary crates
 argon2 = "0.4.1"
-rand = "0.8.5"
+rand = "0.8"
 regex = "1.6.0"
 serde = "1.0.140"
 serde_with = { version = "2.0.0", features = ["time_0_3"] }
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -141,7 +141,7 @@ memchr = { version = "2.4.1", default-features = false }
 num-bigint = { version = "0.4.0", default-features = false, optional = true, features = ["std"] }
 once_cell = "1.9.0"
 percent-encoding = "2.1.0"
-rand = { version = "0.9", default-features = false, optional = true, features = ["std", "std_rng"] }
+rand = { version = "0.8", default-features = false, optional = true, features = ["std", "std_rng"] }
 regex = { version = "1.5.5", optional = true }
 rsa = { version = "0.9.2", optional = true }
 rustls = { version = "0.22.4", optional = true }
diff --git a/sqlx-core/src/lib.rs b/sqlx-core/src/lib.rs
@@ -4,10 +4,10 @@
 #![warn(future_incompatible, rust_2018_idioms)]
 #![allow(clippy::needless_doctest_main, clippy::type_complexity, dead_code)]
 #![deny(
-    cast_possible_truncation,
-    cast_possible_wrap,
-    cast_precision_loss,
-    cast_sign_loss
+    clippy::cast_possible_truncation,
+    clippy::cast_possible_wrap,
+    clippy::cast_precision_loss,
+    clippy::cast_sign_loss
 )]
 // See `clippy.toml` at the workspace root
 #![deny(clippy::disallowed_methods)]
diff --git a/sqlx-core/src/mssql/connection/mod.rs b/sqlx-core/src/mssql/connection/mod.rs
@@ -29,8 +29,6 @@ impl Debug for MssqlConnection {
     }
 }
 
-use std::ops::DerefMut;
-
 impl Connection for MssqlConnection {
     type Database = Mssql;
 
diff --git a/sqlx-core/src/mssql/connection/tls_prelogin_stream_wrapper.rs b/sqlx-core/src/mssql/connection/tls_prelogin_stream_wrapper.rs
@@ -11,7 +11,6 @@ use sqlx_rt::{AsyncRead, AsyncWrite};
 #[cfg(feature = "_rt-tokio")]
 use sqlx_rt::ReadBuf;
 
-use std::cmp;
 use std::io;
 use std::pin::Pin;
 use std::task::{self, ready, Poll};
diff --git a/sqlx-core/src/mssql/protocol/pre_login.rs b/sqlx-core/src/mssql/protocol/pre_login.rs
@@ -1,4 +1,3 @@
-use std::default;
 use std::fmt::{self, Display, Formatter};
 
 use bytes::{Buf, Bytes};
diff --git a/sqlx-core/src/mssql/types/int.rs b/sqlx-core/src/mssql/types/int.rs
@@ -1,5 +1,6 @@
-use byteorder::{ByteOrder, LittleEndian};
 use std::any::type_name;
+use std::convert::TryFrom;
+use std::i16;
 
 use crate::decode::Decode;
 use crate::encode::{Encode, IsNull};
@@ -141,7 +142,7 @@ impl Decode<'_, Mssql> for i64 {
                     .into());
                 }
 
-                buf[..len].copy_from_slice(&bytes_val);
+                buf[..len].copy_from_slice(bytes_val);
                 Ok(i64::from_le_bytes(buf))
             }
             DataType::Numeric | DataType::NumericN | DataType::Decimal | DataType::DecimalN => {
diff --git a/sqlx-core/src/mssql/types/json.rs b/sqlx-core/src/mssql/types/json.rs
@@ -27,7 +27,7 @@ impl<T> Type<Mssql> for Json<T> {
     }
 }
 
-impl<'q, T> Encode<'q, Mssql> for Json<T>
+impl<T> Encode<'_, Mssql> for Json<T>
 where
     T: Serialize,
 {
diff --git a/sqlx-core/src/mssql/types/uint.rs b/sqlx-core/src/mssql/types/uint.rs
@@ -26,7 +26,7 @@ impl Decode<'_, Mssql> for u8 {
     fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
         Ok(*value
             .as_bytes()?
-            .get(0)
+            .first()
             .ok_or("Invalid numeric value length")?)
     }
 }
diff --git a/sqlx-core/src/mysql/connection/auth.rs b/sqlx-core/src/mysql/connection/auth.rs
@@ -149,7 +149,7 @@ async fn encrypt_rsa<'s>(
     // client sends an RSA encrypted password
     let pkey = parse_rsa_pub_key(rsa_pub_key)?;
     let padding = Oaep::new::<sha1::Sha1>();
-    pkey.encrypt(&mut rand::rng(), padding, &pass[..])
+    pkey.encrypt(&mut rand::thread_rng(), padding, &pass[..])
         .map_err(Error::protocol)
 }
 
diff --git a/sqlx-core/src/postgres/connection/establish.rs b/sqlx-core/src/postgres/connection/establish.rs
@@ -1,3 +1,5 @@
+use rand::Rng as _;
+
 use crate::HashMap;
 
 use crate::common::StatementCache;
@@ -144,7 +146,7 @@ impl PgConnection {
             transaction_status,
             transaction_depth: 0,
             pending_ready_for_query_count: 0,
-            next_statement_id: Oid(rand::rng().gen_range(0..u32::MAX)),
+            next_statement_id: Oid(rand::thread_rng().gen()),
             cache_statement: StatementCache::new(options.statement_cache_capacity),
             cache_type_oid: HashMap::new(),
             cache_type_info: HashMap::new(),
diff --git a/sqlx-core/src/postgres/connection/sasl.rs b/sqlx-core/src/postgres/connection/sasl.rs
@@ -174,7 +174,7 @@ pub(crate) async fn authenticate(
 
 // nonce is a sequence of random printable bytes
 fn gen_nonce() -> String {
-    let mut rng = rand::rng();
+    let mut rng = rand::thread_rng();
     let count = rng.gen_range(64..128);
 
     // printable = %x21-2B / %x2D-7E
diff --git a/sqlx-core/src/query.rs b/sqlx-core/src/query.rs
@@ -396,7 +396,7 @@ where
 // Make a SQL query from a statement.
 pub(crate) fn query_statement<'q, DB>(
     statement: &'q <DB as HasStatement<'q>>::Statement,
-) -> Query<'q, DB, <DB as HasArguments<'_>>::Arguments>
+) -> Query<'q, DB, <DB as HasArguments<'q>>::Arguments>
 where
     DB: Database,
 {
diff --git a/sqlx-core/src/query_as.rs b/sqlx-core/src/query_as.rs
@@ -21,7 +21,7 @@ pub struct QueryAs<'q, DB: Database, O, A> {
     pub(crate) output: PhantomData<O>,
 }
 
-impl<'q, DB, O: Send, A: Send> Execute<'q, DB> for QueryAs<'q, DB, O, A>
+impl<'q, DB: Database, O: Send, A: Send> Execute<'q, DB> for QueryAs<'q, DB, O, A>
 where
     DB: Database,
     A: 'q + IntoArguments<'q, DB>,
@@ -197,7 +197,7 @@ where
 // Make a SQL query from a statement, that is mapped to a concrete type.
 pub(crate) fn query_statement_as<'q, DB, O>(
     statement: &'q <DB as HasStatement<'q>>::Statement,
-) -> QueryAs<'q, DB, O, <DB as HasArguments<'_>>::Arguments>
+) -> QueryAs<'q, DB, O, <DB as HasArguments<'q>>::Arguments>
 where
     DB: Database,
     O: for<'r> FromRow<'r, DB::Row>,
diff --git a/sqlx-core/src/query_scalar.rs b/sqlx-core/src/query_scalar.rs
@@ -190,7 +190,7 @@ where
 // Make a SQL query from a statement, that is mapped to a concrete value.
 pub(crate) fn query_statement_scalar<'q, DB, O>(
     statement: &'q <DB as HasStatement<'q>>::Statement,
-) -> QueryScalar<'q, DB, O, <DB as HasArguments<'_>>::Arguments>
+) -> QueryScalar<'q, DB, O, <DB as HasArguments<'q>>::Arguments>
 where
     DB: Database,
     (O,): for<'r> FromRow<'r, DB::Row>,
diff --git a/sqlx-rt/Cargo.toml b/sqlx-rt/Cargo.toml
@@ -11,21 +11,22 @@ authors = [
 ]
 
 [features]
-runtime-actix-native-tls = ["runtime-tokio-native-tls"]
+runtime-actix-native-tls = ["_rt-actix", "_tls-native-tls", "tokio-native-tls"]
 runtime-async-std-native-tls = [
     "_rt-async-std",
     "_tls-native-tls",
     "async-native-tls",
 ]
 runtime-tokio-native-tls = ["_rt-tokio", "_tls-native-tls", "tokio-native-tls"]
 
-runtime-actix-rustls = ["runtime-tokio-rustls"]
+runtime-actix-rustls = ["_rt-actix", "_tls-rustls", "tokio-rustls"]
 runtime-async-std-rustls = ["_rt-async-std", "_tls-rustls", "futures-rustls"]
 runtime-tokio-rustls = ["_rt-tokio", "_tls-rustls", "tokio-rustls"]
 
 # Not used directly and not re-exported from sqlx
 _rt-async-std = ["async-std"]
 _rt-tokio = ["tokio", "once_cell"]
+_rt-actix = ["_rt-tokio"]
 _tls-native-tls = ["native-tls"]
 _tls-rustls = []
 

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ impl Debug for MssqlConnection {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-use std::ops::DerefMut;`
`33`		`-`
`34`	`32`	`impl Connection for MssqlConnection {`
`35`	`33`	`type Database = Mssql;`
`36`	`34`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use std::default;`
`2`	`1`	`use std::fmt::{self, Display, Formatter};`
`3`	`2`
`4`	`3`	`use bytes::{Buf, Bytes};`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-use byteorder::{ByteOrder, LittleEndian};`
`2`	`1`	`use std::any::type_name;`
	`2`	`+use std::convert::TryFrom;`
	`3`	`+use std::i16;`
`3`	`4`
`4`	`5`	`use crate::decode::Decode;`
`5`	`6`	`use crate::encode::{Encode, IsNull};`
`@@ -141,7 +142,7 @@ impl Decode<'_, Mssql> for i64 {`
`141`	`142`	`.into());`
`142`	`143`	`}`
`143`	`144`
`144`		`- buf[..len].copy_from_slice(&bytes_val);`
	`145`	`+ buf[..len].copy_from_slice(bytes_val);`
`145`	`146`	`Ok(i64::from_le_bytes(buf))`
`146`	`147`	`}`
`147`	`148`	`DataType::Numeric \| DataType::NumericN \| DataType::Decimal \| DataType::DecimalN => {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ impl<T> Type<Mssql> for Json<T> {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-impl<'q, T> Encode<'q, Mssql> for Json<T>`
	`30`	`+impl<T> Encode<'_, Mssql> for Json<T>`
`31`	`31`	`where`
`32`	`32`	`T: Serialize,`
`33`	`33`	`{`