cargo clippy

richerarc · May 3, 2024 · ec8882b · ec8882b
1 parent 140f7b6
commit ec8882b
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 34 deletions.
diff --git a/saphir/examples/macro.rs b/saphir/examples/macro.rs
@@ -83,6 +83,7 @@ impl UserController {
     }
 }
 
+#[allow(dead_code)]
 struct ApiKeyMiddleware(String);
 
 #[middleware]

diff --git a/saphir/src/file/content_range.rs b/saphir/src/file/content_range.rs
@@ -3,6 +3,7 @@
 // license: https://github.com/dekellum/hyperx/blob/master/LICENSE
 // source: https://github.com/dekellum/hyperx/blob/master/src/header/common/content_range.rs
 
+use std::fmt::Display;
 use crate::error::SaphirError;
 use std::str::FromStr;
 
@@ -98,8 +99,8 @@ impl FromStr for ContentRange {
     }
 }
 
-impl ToString for ContentRange {
-    fn to_string(&self) -> String {
+impl Display for ContentRange {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
             ContentRange::Bytes { range, instance_length } => {
                 let mut string = "bytes ".to_owned();
@@ -118,9 +119,9 @@ impl ToString for ContentRange {
                     string.push('*')
                 }
 
-                string
+                write!(f, "{}", string)
             }
-            ContentRange::Unregistered { ref unit, ref resp } => format!("{} {}", unit, resp),
+            ContentRange::Unregistered { ref unit, ref resp } => write!(f, "{} {}", unit, resp),
         }
     }
 }
diff --git a/saphir/src/file/mod.rs b/saphir/src/file/mod.rs
@@ -21,6 +21,7 @@ use std::{
     io::{Cursor as CursorSync, Write},
     str::FromStr,
 };
+use std::fmt::Display;
 use tokio::io::ReadBuf;
 
 mod cache;
@@ -212,13 +213,13 @@ impl FromStr for Compression {
     }
 }
 
-impl ToString for Compression {
-    fn to_string(&self) -> String {
+impl Display for Compression {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Compression::Deflate => "deflate".to_string(),
-            Compression::Gzip => "gzip".to_string(),
-            Compression::Brotli => "br".to_string(),
-            _ => "".to_string(),
+            Compression::Deflate => write!(f, "deflate"),
+            Compression::Gzip => write!(f, "gzip"),
+            Compression::Brotli => write!(f, "br"),
+            _ => write!(f, ""),
         }
     }
 }

diff --git a/saphir/src/file/range.rs b/saphir/src/file/range.rs
@@ -3,6 +3,7 @@
 // license: https://github.com/dekellum/hyperx/blob/master/LICENSE
 // source: https://github.com/dekellum/hyperx/blob/master/src/header/common/range.rs
 
+use std::fmt::Display;
 use crate::error::SaphirError;
 use std::str::FromStr;
 
@@ -104,18 +105,18 @@ impl ByteRangeSpec {
     }
 }
 
-impl ToString for ByteRangeSpec {
-    fn to_string(&self) -> String {
+impl Display for ByteRangeSpec {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
-            ByteRangeSpec::FromTo(from, to) => format!("{}-{}", from, to),
-            ByteRangeSpec::Last(pos) => format!("-{}", pos),
-            ByteRangeSpec::AllFrom(pos) => format!("{}-", pos),
+            ByteRangeSpec::FromTo(from, to) => write!(f, "{}-{}", from, to),
+            ByteRangeSpec::Last(pos) => write!(f, "-{}", pos),
+            ByteRangeSpec::AllFrom(pos) => write!(f, "{}-", pos),
         }
     }
 }
 
-impl ToString for Range {
-    fn to_string(&self) -> String {
+impl Display for Range {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
             Range::Bytes(ref ranges) => {
                 let mut string = "bytes=".to_owned();
@@ -127,9 +128,9 @@ impl ToString for Range {
                     string.push_str(&range.to_string())
                 }
 
-                string
+                write!(f, "{}", string)
             }
-            Range::Unregistered(ref unit, ref range_str) => format!("{}={}", unit, range_str),
+            Range::Unregistered(ref unit, ref range_str) => write!(f, "{}={}", unit, range_str),
         }
     }
 }

diff --git a/saphir/src/http_context.rs b/saphir/src/http_context.rs
@@ -222,7 +222,7 @@ impl HttpContext {
                 .get(OPERATION_ID_HEADER)
                 .and_then(|h| h.to_str().ok())
                 .and_then(|op_id_str| operation::OperationId::from_str(op_id_str).ok())
-                .unwrap_or_else(operation::OperationId::new);
+                .unwrap_or_default();
             *request.operation_id_mut() = operation_id;
             let state = State::Before(Box::new(request));
             let router = Some(router);

diff --git a/saphir/src/lib.rs b/saphir/src/lib.rs
@@ -71,6 +71,7 @@
 //! *_More feature will be added in the future_*
 #![allow(clippy::match_like_matches_macro)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
+#![allow(clippy::empty_docs)]
 
 #[macro_use]
 extern crate log;

diff --git a/saphir/src/server.rs b/saphir/src/server.rs
@@ -326,7 +326,7 @@ where
 
     pub fn build(self) -> Server {
         Server {
-            listener_config: self.listener.unwrap_or_else(ListenerBuilder::new).build(),
+            listener_config: self.listener.unwrap_or_default().build(),
             stack: Stack {
                 router: self.router.build(),
                 middlewares: self.middlewares.build(),

diff --git a/saphir/src/utils.rs b/saphir/src/utils.rs
@@ -12,6 +12,7 @@ use std::{
     iter::FromIterator,
     str::FromStr,
     sync::atomic::AtomicU64,
+    fmt::Write,
 };
 
 // TODO: Add possibility to match any route like /page/<path..>/view
@@ -392,7 +393,10 @@ impl UriPathMatcher {
                 let mut segments = path_segments.clone();
                 if Self::match_start(start, &mut segments) && Self::match_end(end, &mut segments) {
                     if let Some(name) = wildcard_capture_name {
-                        let value = segments.iter().map(|&s| format!("/{}", s)).collect();
+                        let value = segments.iter().fold(String::new(), |mut o, &s| {
+                            let _ = write!(o, "/{}", s);
+                            o
+                        });
                         captures.insert(name.clone(), value);
                     }
                 } else {

diff --git a/saphir_cli/src/openapi/generate/mod.rs b/saphir_cli/src/openapi/generate/mod.rs
@@ -726,7 +726,6 @@ by using the --package flag."
                 }
                 let values = raw[5..(len - 1)]
                     .split(&[',', '|'][..])
-                    .into_iter()
                     .map(|v| v.trim().trim_start_matches(char_is_quote).trim_end_matches(char_is_quote).to_string())
                     .collect::<Vec<_>>();
                 let values_len = values.len();

diff --git a/saphir_cli/src/openapi/generate/response_info.rs b/saphir_cli/src/openapi/generate/response_info.rs
@@ -138,7 +138,7 @@ impl Gen {
                             for (code, type_name) in pairs {
                                 if !type_name.is_empty() {
                                     if let Some(mut anonymous_type) = self.openapitype_from_raw(method.impl_item.im.item.scope, type_name.as_str()) {
-                                        anonymous_type.name = name.clone();
+                                        anonymous_type.name.clone_from(&name);
                                         vec.push((
                                             Some(code),
                                             ResponseInfo {
@@ -274,17 +274,15 @@ impl Gen {
                                             }
                                         }
                                     }
-                                } else {
-                                    if let Some(type_path) = type_path {
-                                        let anonymous_type = self.openapitype_from_raw(method.impl_item.im.item.scope, type_path.as_str());
-                                        if let Some(mut anonymous_type) = anonymous_type {
-                                            if let Some(name) = name {
-                                                anonymous_type.name = Some(name);
-                                            }
-
-                                            res.1.type_info = None;
-                                            res.1.anonymous_type = Some(anonymous_type);
+                                } else if let Some(type_path) = type_path {
+                                    let anonymous_type = self.openapitype_from_raw(method.impl_item.im.item.scope, type_path.as_str());
+                                    if let Some(mut anonymous_type) = anonymous_type {
+                                        if let Some(name) = name {
+                                            anonymous_type.name = Some(name);
                                         }
+
+                                        res.1.type_info = None;
+                                        res.1.anonymous_type = Some(anonymous_type);
                                     }
                                 }
                             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ impl UserController { @@
         }
     }
+    #[allow(dead_code)]
     struct ApiKeyMiddleware(String);
     #[middleware]
@@ Expand Down @@