Manually fix a part of the remaining clippy warnings in capnp

Author: ariel-miculas

capnp/src/introspect.rs

@@ -96,14 +96,14 @@ impl Type {
         if self.list_count > 0 {
             true
         } else {
-            match self.base {
+            matches!(
+                self.base,
                 BaseType::Text
-                | BaseType::Data
-                | BaseType::AnyPointer
-                | BaseType::Struct(_)
-                | BaseType::Capability => true,
-                _ => false,
-            }
+                    | BaseType::Data
+                    | BaseType::AnyPointer
+                    | BaseType::Struct(_)
+                    | BaseType::Capability
+            )
         }
     }
 }

capnp/src/primitive_list.rs

@@ -116,7 +116,7 @@ impl<'a, T: PrimitiveElement> Reader<'a, T> {
     /// Returns something if the slice is as expected in memory.
     pub fn as_slice(&self) -> Option<&[T]> {
         if self.reader.get_element_size() == T::element_size() {
-            let bytes = self.reader.into_raw_bytes();
+            let bytes = self.reader.as_raw_bytes();
             Some(unsafe {
                 use core::slice;
                 slice::from_raw_parts(
@@ -174,7 +174,7 @@ where
     #[cfg(all(target_endian = "little"))]
     pub fn as_slice(&mut self) -> Option<&mut [T]> {
         if self.builder.get_element_size() == T::element_size() {
-            let bytes = self.builder.into_raw_bytes();
+            let bytes = self.builder.as_raw_bytes();
             Some(unsafe {
                 core::slice::from_raw_parts_mut(
                     bytes.as_mut_ptr() as *mut T,

capnp/src/private/layout.rs

@@ -159,7 +159,7 @@ impl WirePointer {
     }
 
     #[inline]
-    pub fn target(ptr: *const Self) -> *const u8 {
+    pub unsafe fn target(ptr: *const Self) -> *const u8 {
         let this_addr: *const u8 = ptr as *const _;
         unsafe { this_addr.offset(8 * (1 + (((*ptr).offset_and_kind.get() as i32) >> 2)) as isize) }
     }
@@ -2184,6 +2184,7 @@ mod wire_helpers {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub unsafe fn copy_pointer(
         dst_arena: &mut dyn BuilderArena,
         dst_segment_id: u32,
@@ -3904,7 +3905,7 @@ impl<'a> ListReader<'a> {
         self.element_size
     }
 
-    pub(crate) fn into_raw_bytes(self) -> &'a [u8] {
+    pub(crate) fn as_raw_bytes(self) -> &'a [u8] {
         if self.element_count == 0 {
             // Explictly handle this case to avoid forming a slice to a null pointer,
             // which would be undefined behavior.
@@ -4167,7 +4168,7 @@ impl<'a> ListBuilder<'a> {
         }
     }
 
-    pub(crate) fn into_raw_bytes(&self) -> &'a mut [u8] {
+    pub(crate) fn as_raw_bytes(&self) -> &'a mut [u8] {
         if self.element_count == 0 {
             // Explictly handle this case to avoid forming a slice to a null pointer,
             // which would be undefined behavior.

capnp/src/raw.rs

@@ -65,5 +65,5 @@ pub fn get_list_bytes<'a, T>(value: T) -> &'a [u8]
 where
     T: IntoInternalListReader<'a>,
 {
-    value.into_internal_list_reader().into_raw_bytes()
+    value.into_internal_list_reader().as_raw_bytes()
 }

capnp/src/schema.rs

@@ -161,6 +161,10 @@ impl FieldList {
         self.fields.len() as u16
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
     pub fn get(self, index: u16) -> Field {
         Field {
             proto: self.fields.get(index as u32),
@@ -174,13 +178,13 @@ impl FieldList {
     }
 }
 
-impl<'a> IndexMove<u16, Field> for FieldList {
+impl IndexMove<u16, Field> for FieldList {
     fn index_move(&self, index: u16) -> Field {
         self.get(index)
     }
 }
 
-impl<'a> ::core::iter::IntoIterator for FieldList {
+impl ::core::iter::IntoIterator for FieldList {
     type Item = Field;
     type IntoIter = ShortListIter<FieldList, Self::Item>;
 
@@ -220,13 +224,13 @@ impl FieldSubset {
     }
 }
 
-impl<'a> IndexMove<u16, Field> for FieldSubset {
+impl IndexMove<u16, Field> for FieldSubset {
     fn index_move(&self, index: u16) -> Field {
         self.get(index)
     }
 }
 
-impl<'a> ::core::iter::IntoIterator for FieldSubset {
+impl ::core::iter::IntoIterator for FieldSubset {
     type Item = Field;
     type IntoIter = ShortListIter<FieldSubset, Self::Item>;
 
@@ -341,13 +345,13 @@ impl EnumerantList {
     }
 }
 
-impl<'a> IndexMove<u16, Enumerant> for EnumerantList {
+impl IndexMove<u16, Enumerant> for EnumerantList {
     fn index_move(&self, index: u16) -> Enumerant {
         self.get(index)
     }
 }
 
-impl<'a> ::core::iter::IntoIterator for EnumerantList {
+impl ::core::iter::IntoIterator for EnumerantList {
     type Item = Enumerant;
     type IntoIter = ShortListIter<Self, Self::Item>;
 
@@ -414,13 +418,13 @@ impl AnnotationList {
     }
 }
 
-impl<'a> IndexMove<u32, Annotation> for AnnotationList {
+impl IndexMove<u32, Annotation> for AnnotationList {
     fn index_move(&self, index: u32) -> Annotation {
         self.get(index)
     }
 }
 
-impl<'a> ::core::iter::IntoIterator for AnnotationList {
+impl ::core::iter::IntoIterator for AnnotationList {
     type Item = Annotation;
     type IntoIter = ListIter<Self, Self::Item>;
 

capnp/src/serialize.rs

@@ -352,11 +352,7 @@ where
 
     let segment_count = u32::from_le_bytes(buf[0..4].try_into().unwrap()).wrapping_add(1) as usize;
 
-    if segment_count >= SEGMENTS_COUNT_LIMIT {
-        return Err(Error::from_kind(ErrorKind::InvalidNumberOfSegments(
-            segment_count,
-        )));
-    } else if segment_count == 0 {
+    if segment_count >= SEGMENTS_COUNT_LIMIT || segment_count == 0 {
         return Err(Error::from_kind(ErrorKind::InvalidNumberOfSegments(
             segment_count,
         )));