Merge pull request #1359 from Lorak-mmk/clippy-expect

Clippy overhaul

Author: Lorak-mmk

clippy.toml

@@ -0,0 +1 @@
+avoid-breaking-exported-api = false

examples/basic.rs

@@ -61,7 +61,7 @@ async fn main() -> Result<()> {
     }
 
     // Or as custom structs that derive DeserializeRow
-    #[allow(unused)]
+    #[expect(unused)]
     #[derive(Debug, DeserializeRow)]
     struct RowData {
         a: i32,

scylla-cql/src/deserialize/frame_slice.rs

@@ -121,6 +121,9 @@ impl<'frame> FrameSlice<'frame> {
     /// Returns a new Bytes object which is a subslice of the original Bytes
     /// frame slice object.
     #[inline]
+    // Check triggers because `self` is `Copy`, so `to_` should take it by value.
+    // TODO(2.0): Take self by value.
+    #[expect(clippy::wrong_self_convention)]
     pub fn to_bytes(&self) -> Bytes {
         if self.original_frame.is_empty() {
             // For the borrowed, deficient version of FrameSlice - the one created with

scylla-cql/src/deserialize/result.rs

@@ -175,7 +175,7 @@ impl RawRowLendingIterator {
     /// The column iterator must be consumed before the rows iterator can
     /// continue.
     #[inline]
-    #[allow(clippy::should_implement_trait)] // https://github.com/rust-lang/rust-clippy/issues/5004
+    #[expect(clippy::should_implement_trait)] // https://github.com/rust-lang/rust-clippy/issues/5004
     pub fn next(&mut self) -> Option<Result<ColumnIterator, DeserializationError>> {
         self.remaining = self.remaining.checked_sub(1)?;
 
@@ -256,9 +256,6 @@ mod tests {
         fn lend_next(&mut self) -> Option<Result<Self::Item<'_>, DeserializationError>>;
     }
 
-    // Disable the lint, if there is more than one lifetime included.
-    // Can be removed once https://github.com/rust-lang/rust-clippy/issues/12495 is fixed.
-    #[allow(clippy::needless_lifetimes)]
     impl<'frame, 'metadata> LendingIterator for RawRowIterator<'frame, 'metadata> {
         type Item<'borrow>
             = ColumnIterator<'borrow, 'borrow>

scylla-cql/src/deserialize/row_tests.rs

@@ -84,12 +84,10 @@ fn test_deserialization_as_column_iterator() {
 // Do not remove. It's not used in tests but we keep it here to check that
 // we properly ignore warnings about unused variables, unnecessary `mut`s
 // etc. that usually pop up when generating code for empty structs.
-#[allow(unused)]
 #[derive(DeserializeRow)]
 #[scylla(crate = crate)]
 struct TestUdtWithNoFieldsUnordered {}
 
-#[allow(unused)]
 #[derive(DeserializeRow)]
 #[scylla(crate = crate, flavor = "enforce_order")]
 struct TestUdtWithNoFieldsOrdered {}
@@ -934,9 +932,9 @@ fn metadata_does_not_bound_deserialized_rows() {
         #[derive(DeserializeRow)]
         #[scylla(crate=crate)]
         struct MyRow<'frame> {
-            #[allow(dead_code)]
+            #[expect(dead_code)]
             bytes: &'frame [u8],
-            #[allow(dead_code)]
+            #[expect(dead_code)]
             text: &'frame str,
         }
         let decoded_custom_struct_res = deserialize::<MyRow>(row_typ, &bytes);

scylla-cql/src/deserialize/value.rs

@@ -2167,6 +2167,9 @@ impl From<VectorDeserializationErrorKind> for BuiltinDeserializationErrorKind {
 /// Describes why deserialization of a map type failed.
 #[derive(Debug)]
 #[non_exhaustive]
+// Check triggers because all variants end with "DeserializationFailed".
+// TODO(2.0): Remove the "DeserializationFailed" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum MapDeserializationErrorKind {
     /// Failed to deserialize map's length.
     LengthDeserializationFailed(DeserializationError),

scylla-cql/src/deserialize/value_tests.rs

@@ -42,7 +42,7 @@ fn test_custom_cassandra_type_parser() {
             dimensions: 5,
         },
     ),
-    (  "636f6c756d6e:org.apache.cassandra.db.marshal.ListType(org.apache.cassandra.db.marshal.Int32Type)", 
+    (  "636f6c756d6e:org.apache.cassandra.db.marshal.ListType(org.apache.cassandra.db.marshal.Int32Type)",
         ColumnType::Collection {
             frozen: false,
             typ: CollectionType::List(Box::new(ColumnType::Native(NativeType::Int))),
@@ -1200,12 +1200,10 @@ impl UdtSerializer {
 // Do not remove. It's not used in tests but we keep it here to check that
 // we properly ignore warnings about unused variables, unnecessary `mut`s
 // etc. that usually pop up when generating code for empty structs.
-#[allow(unused)]
 #[derive(scylla_macros::DeserializeValue)]
 #[scylla(crate = crate)]
 struct TestUdtWithNoFieldsUnordered {}
 
-#[allow(unused)]
 #[derive(scylla_macros::DeserializeValue)]
 #[scylla(crate = crate, flavor = "enforce_order")]
 struct TestUdtWithNoFieldsOrdered {}
@@ -2783,9 +2781,9 @@ fn metadata_does_not_bound_deserialized_values() {
         #[derive(DeserializeValue)]
         #[scylla(crate=crate)]
         struct Udt<'frame> {
-            #[allow(dead_code)]
+            #[expect(dead_code)]
             bytes: &'frame [u8],
-            #[allow(dead_code)]
+            #[expect(dead_code)]
             text: &'frame str,
         }
         let decoded_udt_res = deserialize::<Udt>(&udt_typ, &bytes);

scylla-cql/src/frame/frame_errors.rs

@@ -130,6 +130,9 @@ pub enum CqlRequestSerializationError {
 /// server response fails.
 #[non_exhaustive]
 #[derive(Error, Debug, Clone)]
+// Check triggers because all variants begin with "Cql".
+// TODO(2.0): Remove the "Cql" prefix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum CqlResponseParseError {
     #[error("Failed to deserialize ERROR response: {0}")]
     CqlErrorParseError(#[from] CqlErrorParseError),
@@ -313,6 +316,9 @@ pub enum PreparedParseError {
 /// - paging state response
 #[non_exhaustive]
 #[derive(Debug, Error, Clone)]
+// Check triggers because all variants end with "ParseError".
+// TODO(2.0): Remove the "ParseError" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum RawRowsAndPagingStateResponseParseError {
     /// Failed to parse metadata flags.
     #[error("Malformed metadata flags: {0}")]
@@ -331,6 +337,9 @@ pub enum RawRowsAndPagingStateResponseParseError {
 /// of statement's prepared metadata failed.
 #[non_exhaustive]
 #[derive(Error, Debug, Clone)]
+// Check triggers because all variants end with "ParseError".
+// TODO(2.0): Remove the "ParseError" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum PreparedMetadataParseError {
     /// Failed to parse metadata flags.
     #[error("Malformed metadata flags: {0}")]
@@ -375,6 +384,9 @@ pub enum ResultMetadataAndRowsCountParseError {
 /// of result metadata failed.
 #[non_exhaustive]
 #[derive(Error, Debug, Clone)]
+// Check triggers because all variants end with "ParseError".
+// TODO(2.0): Remove the "ParseError" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum ResultMetadataParseError {
     /// Failed to parse metadata flags.
     #[error("Malformed metadata flags: {0}")]
@@ -422,6 +434,9 @@ pub struct ColumnSpecParseError {
 /// of a column specification.
 #[non_exhaustive]
 #[derive(Error, Debug, Clone)]
+// Check triggers because all variants end with "ParseError".
+// TODO(2.0): Remove the "ParseError" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum ColumnSpecParseErrorKind {
     #[error("Invalid table spec: {0}")]
     TableSpecParseError(#[from] TableSpecParseError),

scylla-cql/src/frame/mod.rs

@@ -31,8 +31,11 @@ pub mod flag {
     pub const WARNING: u8 = 0x08;
 }
 
-// All of the Authenticators supported by Scylla
+/// All of the Authenticators supported by Scylla
 #[derive(Debug, PartialEq, Eq, Clone)]
+// Check triggers because all variants end with "Authenticator".
+// TODO(2.0): Remove the "Authenticator" postfix from variants.
+#[expect(clippy::enum_variant_names)]
 pub enum Authenticator {
     AllowAllAuthenticator,
     PasswordAuthenticator,

scylla-cql/src/frame/request/batch.rs

@@ -226,9 +226,6 @@ impl BatchStatement<'_> {
     }
 }
 
-// Disable the lint, if there is more than one lifetime included.
-// Can be removed once https://github.com/rust-lang/rust-clippy/issues/12495 is fixed.
-#[allow(clippy::needless_lifetimes)]
 impl<'s, 'b> From<&'s BatchStatement<'b>> for BatchStatement<'s> {
     fn from(value: &'s BatchStatement) -> Self {
         match value {