Minor clippy fixes

apache · Jan 5, 2025 · 937f398 · 937f398
1 parent 24a6bff
commit 937f398
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/arrow-cast/src/parse.rs b/arrow-cast/src/parse.rs
@@ -881,18 +881,15 @@ pub fn parse_decimal<T: DecimalType>(
                 for (_, b) in bs.by_ref() {
                     if !b.is_ascii_digit() {
                         if *b == b'e' || *b == b'E' {
-                            result = match parse_e_notation::<T>(
+                            result = parse_e_notation::<T>(
                                 s,
                                 digits as u16,
                                 fractionals as i16,
                                 result,
                                 point_index,
                                 precision as u16,
                                 scale as i16,
-                            ) {
-                                Err(e) => return Err(e),
-                                Ok(v) => v,
-                            };
+                            )?;
 
                             is_e_notation = true;
 
@@ -926,18 +923,15 @@ pub fn parse_decimal<T: DecimalType>(
                 }
             }
             b'e' | b'E' => {
-                result = match parse_e_notation::<T>(
+                result = parse_e_notation::<T>(
                     s,
                     digits as u16,
                     fractionals as i16,
                     result,
                     index,
                     precision as u16,
                     scale as i16,
-                ) {
-                    Err(e) => return Err(e),
-                    Ok(v) => v,
-                };
+                )?;
 
                 is_e_notation = true;
 

diff --git a/arrow-flight/src/encode.rs b/arrow-flight/src/encode.rs
@@ -1833,7 +1833,7 @@ mod tests {
             .flight_descriptor
             .as_ref()
             .map(|descriptor| {
-                let path_len: usize = descriptor.path.iter().map(|p| p.as_bytes().len()).sum();
+                let path_len: usize = descriptor.path.iter().map(|p| p.len()).sum();
 
                 std::mem::size_of_val(descriptor) + descriptor.cmd.len() + path_len
             })

diff --git a/object_store/src/aws/client.rs b/object_store/src/aws/client.rs
@@ -299,7 +299,7 @@ pub(crate) struct Request<'a> {
     retry_error_body: bool,
 }
 
-impl<'a> Request<'a> {
+impl Request<'_> {
     pub(crate) fn query<T: Serialize + ?Sized + Sync>(self, query: &T) -> Self {
         let builder = self.builder.query(query);
         Self { builder, ..self }

diff --git a/object_store/src/azure/client.rs b/object_store/src/azure/client.rs
@@ -198,7 +198,7 @@ struct PutRequest<'a> {
     idempotent: bool,
 }
 
-impl<'a> PutRequest<'a> {
+impl PutRequest<'_> {
     fn header(self, k: &HeaderName, v: &str) -> Self {
         let builder = self.builder.header(k, v);
         Self { builder, ..self }

diff --git a/object_store/src/gcp/client.rs b/object_store/src/gcp/client.rs
@@ -173,7 +173,7 @@ pub(crate) struct Request<'a> {
     idempotent: bool,
 }
 
-impl<'a> Request<'a> {
+impl Request<'_> {
     fn header(self, k: &HeaderName, v: &str) -> Self {
         let builder = self.builder.header(k, v);
         Self { builder, ..self }

diff --git a/parquet/src/arrow/async_reader/mod.rs b/parquet/src/arrow/async_reader/mod.rs
@@ -792,7 +792,7 @@ struct InMemoryRowGroup<'a> {
     row_count: usize,
 }
 
-impl<'a> InMemoryRowGroup<'a> {
+impl InMemoryRowGroup<'_> {
     /// Fetches the necessary column data into memory
     async fn fetch<T: AsyncFileReader + Send>(
         &mut self,

diff --git a/parquet/src/column/writer/mod.rs b/parquet/src/column/writer/mod.rs
@@ -3275,8 +3275,8 @@ mod tests {
     fn test_truncate_utf8() {
         // No-op
         let data = "❤️🧡💛💚💙💜";
-        let r = truncate_utf8(data, data.as_bytes().len()).unwrap();
-        assert_eq!(r.len(), data.as_bytes().len());
+        let r = truncate_utf8(data, data.len()).unwrap();
+        assert_eq!(r.len(), data.len());
         assert_eq!(&r, data.as_bytes());
 
         // We slice it away from the UTF8 boundary