Merge pull request #1319 from wprzytula/adjust-to-msrv-1.80

Adjust to MSRV 1.80

Author: wprzytula

Cargo.lock.msrv

@@ -237,6 +237,7 @@ mod tests {
 
     use bytes::Bytes;
     use std::ops::Deref;
+    use std::sync::LazyLock;
 
     use crate::frame::response::result::{
         ColumnSpec, ColumnType, DeserializedMetadataAndRawRows, NativeType, ResultMetadata,
@@ -285,19 +286,15 @@ mod tests {
         //
         // I: for<'item> LendingIterator<Item<'item> = ColumnIterator<'item>>,
         //
-        // The bug is said to be a lot of effort to fix, so in tests let's just use `lazy_static`
+        // The bug is said to be a lot of effort to fix, so in tests let's just use `LazyLock`
         // to obtain 'static references.
-        //
-        // `std::sync::LazyLock` is stable since 1.80, so once we bump MSRV enough,
-        // we will be able to replace `lazy_static` with `LazyLock`.
 
         static SPECS: &[ColumnSpec<'static>] = &[
             spec("b1", ColumnType::Native(NativeType::Blob)),
             spec("b2", ColumnType::Native(NativeType::Blob)),
         ];
-        lazy_static::lazy_static! {
-            static ref RAW_DATA: Bytes = serialize_cells([Some(CELL1), Some(CELL2), Some(CELL2), Some(CELL1)]);
-        }
+        static RAW_DATA: LazyLock<Bytes> =
+            LazyLock::new(|| serialize_cells([Some(CELL1), Some(CELL2), Some(CELL2), Some(CELL1)]));
         let raw_data = RAW_DATA.deref();
         let specs = SPECS;
 
@@ -339,9 +336,9 @@ mod tests {
             spec("b1", ColumnType::Native(NativeType::Blob)),
             spec("b2", ColumnType::Native(NativeType::Blob)),
         ];
-        lazy_static::lazy_static! {
-            static ref RAW_DATA: Bytes = serialize_cells([Some(CELL1), Some(CELL2)]);
-        }
+        static RAW_DATA: LazyLock<Bytes> =
+            LazyLock::new(|| serialize_cells([Some(CELL1), Some(CELL2)]));
+
         let raw_data = RAW_DATA.deref();
         let specs = SPECS;
 

scylla-cql/src/deserialize/result.rs

@@ -79,7 +79,6 @@ url = { version = "2.3.1", optional = true }
 base64 = { version = "0.22.1", optional = true }
 rand_pcg = "0.9.0"
 socket2 = { version = "0.5.3", features = ["all"] }
-lazy_static = "1"
 
 [dev-dependencies]
 num-bigint-03 = { package = "num-bigint", version = "0.3" }

scylla/Cargo.toml

@@ -28,7 +28,6 @@ use tracing::warn;
 mod sealed {
     // This is a sealed trait - its whole purpose is to be unnameable.
     // This means we need to disable the check.
-    #[allow(unknown_lints)] // Rust 1.66 doesn't know this lint
     #[allow(unnameable_types)]
     pub trait Sealed {}
 }

scylla/src/client/session_builder.rs

@@ -83,9 +83,7 @@ impl TlsProvider {
                 };
 
                 cloud_config.make_tls_config_for_scylla_cloud_host(host_id, dc, address)
-                    // inspect_err() is stable since 1.76.
-                    // TODO: use inspect_err once we bump MSRV to at least 1.76.
-                    .map_err(|err| {
+                    .inspect_err(|err| {
                         warn!(
                             "TlsProvider for SNI connection to Scylla Cloud node {{ host_id={:?}, dc={:?} at {} }} could not be set up: {}\n Proceeding with attempting probably nonworking connection",
                             host_id,

scylla/src/network/tls.rs

@@ -1,6 +1,5 @@
 use bytes::Bytes;
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use scylla_cql::deserialize::value::{DeserializeValue, ListlikeIterator};
 use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
 use scylla_cql::frame::response::result::{CollectionType, ColumnType, NativeType, TableSpec};
@@ -13,7 +12,7 @@ use crate::routing::{Shard, Token};
 
 use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 
 #[derive(Error, Debug)]
 pub(crate) enum TabletParsingError {
@@ -42,19 +41,19 @@ pub(crate) struct RawTablet {
 type RawTabletPayload<'frame, 'metadata> =
     (i64, i64, ListlikeIterator<'frame, 'metadata, (Uuid, i32)>);
 
-lazy_static! {
-    static ref RAW_TABLETS_CQL_TYPE: ColumnType<'static> = ColumnType::Tuple(vec![
+static RAW_TABLETS_CQL_TYPE: LazyLock<ColumnType<'static>> = LazyLock::new(|| {
+    ColumnType::Tuple(vec![
         ColumnType::Native(NativeType::BigInt),
         ColumnType::Native(NativeType::BigInt),
         ColumnType::Collection {
             frozen: false,
             typ: CollectionType::List(Box::new(ColumnType::Tuple(vec![
                 ColumnType::Native(NativeType::Uuid),
                 ColumnType::Native(NativeType::Int),
-            ])))
+            ]))),
         },
-    ]);
-}
+    ])
+});
 
 const CUSTOM_PAYLOAD_TABLETS_V1_KEY: &str = "tablets-routing-v1";
 

scylla/src/routing/locator/tablets.rs

@@ -78,7 +78,6 @@ impl PartitionerHasher for PartitionerHasherAny {
 mod sealed {
     // This is a sealed trait - its whole purpose is to be unnameable.
     // This means we need to disable the check.
-    #[allow(unknown_lints)] // Rust 1.70 doesn't know this lint
     #[allow(unnameable_types)]
     pub trait Sealed {}
 }