Merge pull request #357 from danieleades/clippy-msrv

configure the clippy MSRV

Author: dwrensha

.clippy.toml

@@ -0,0 +1 @@
+msrv = "1.65.0"

capnp/src/lib.rs

@@ -234,21 +234,21 @@ impl core::convert::From<::std::io::Error> for Error {
             _ => ErrorKind::Failed,
         };
         Self {
-            description: format!("{}", err),
+            description: format!("{err}"),
             kind,
         }
     }
 }
 
 impl core::convert::From<alloc::string::FromUtf8Error> for Error {
     fn from(err: alloc::string::FromUtf8Error) -> Self {
-        Self::failed(format!("{}", err))
+        Self::failed(format!("{err}"))
     }
 }
 
 impl core::convert::From<alloc::str::Utf8Error> for Error {
     fn from(err: alloc::str::Utf8Error) -> Self {
-        Self::failed(format!("{}", err))
+        Self::failed(format!("{err}"))
     }
 }
 

capnp/src/private/arena.rs

@@ -103,7 +103,7 @@ where
 
                 Ok((seg.as_ptr(), (seg.len() / BYTES_PER_WORD) as u32))
             }
-            None => Err(Error::failed(format!("Invalid segment id: {}", id))),
+            None => Err(Error::failed(format!("Invalid segment id: {id}"))),
         }
     }
 

capnp/src/private/layout.rs

@@ -64,7 +64,7 @@ impl ElementSize {
             5 => Self::EightBytes,
             6 => Self::Pointer,
             7 => Self::InlineComposite,
-            _ => panic!("illegal element size: {}", val),
+            _ => panic!("illegal element size: {val}"),
         }
     }
 }
@@ -124,7 +124,7 @@ impl WirePointerKind {
             1 => Self::List,
             2 => Self::Far,
             3 => Self::Other,
-            _ => panic!("illegal element size: {}", val),
+            _ => panic!("illegal element size: {val}"),
         }
     }
 }
@@ -2427,8 +2427,7 @@ mod wire_helpers {
             match cap_table.extract_cap(n) {
                 Some(client_hook) => Ok(client_hook),
                 None => Err(Error::failed(format!(
-                    "Message contains invalid capability pointer. Index: {}",
-                    n
+                    "Message contains invalid capability pointer. Index: {n}"
                 ))),
             }
         }

capnp/src/serialize.rs

@@ -339,15 +339,9 @@ 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::failed(format!(
-            "Too many segments: {}",
-            segment_count
-        )));
+        return Err(Error::failed(format!("Too many segments: {segment_count}")));
     } else if segment_count == 0 {
-        return Err(Error::failed(format!(
-            "Too few segments: {}",
-            segment_count
-        )));
+        return Err(Error::failed(format!("Too few segments: {segment_count}")));
     }
 
     let mut segment_lengths_builder = SegmentLengthsBuilder::with_capacity(segment_count);

capnp/src/serialize/no_alloc_slice_segments.rs

@@ -47,8 +47,7 @@ impl<'b> NoAllocSliceSegments<'b> {
 
         if segments_count >= SEGMENTS_COUNT_LIMIT {
             return Err(Error::failed(format!(
-                "Too many segments: {}",
-                segments_count
+                "Too many segments: {segments_count}"
             )));
         }
 
@@ -75,9 +74,8 @@ impl<'b> NoAllocSliceSegments<'b> {
             let total_segments_length_words = total_segments_length_bytes / 8;
             if total_segments_length_words > limit {
                 return Err(Error::failed(format!(
-                    "Message has {} words, which is too large. To increase the limit on the \
-                             receiving end, see capnp::message::ReaderOptions.",
-                    total_segments_length_words
+                    "Message has {total_segments_length_words} words, which is too large. To increase the limit on the \
+                             receiving end, see capnp::message::ReaderOptions."
                 )));
             }
         }

capnp/src/text.rs

@@ -38,10 +38,7 @@ pub type Reader<'a> = &'a str;
 pub fn new_reader(v: &[u8]) -> Result<Reader<'_>> {
     match str::from_utf8(v) {
         Ok(v) => Ok(v),
-        Err(e) => Err(Error::failed(format!(
-            "Text contains non-utf8 data: {:?}",
-            e
-        ))),
+        Err(e) => Err(Error::failed(format!("Text contains non-utf8 data: {e:?}"))),
     }
 }
 
@@ -63,10 +60,7 @@ impl<'a> Builder<'a> {
     pub fn new(bytes: &mut [u8], pos: u32) -> Result<Builder<'_>> {
         if pos != 0 {
             if let Err(e) = str::from_utf8(bytes) {
-                return Err(Error::failed(format!(
-                    "Text contains non-utf8 data: {:?}",
-                    e
-                )));
+                return Err(Error::failed(format!("Text contains non-utf8 data: {e:?}")));
             }
         }
         Ok(Builder {