Clippy Fixyes

Author: system

rwf-cli/src/main.rs

@@ -165,7 +165,7 @@ async fn main() {
                         .migrations()
                         .first()
                         .map(|mig| mig.version);
-                    migrate::revert(minv.clone()).await;
+                    migrate::revert(minv).await;
                     migrate::downgrade(None).await;
                     migrate::upgrade(None).await;
                     migrate::migrate(None).await;

rwf-macros/src/openapi.rs

@@ -227,7 +227,7 @@ fn parse_call(expr: &Expr, acc: &mut Vec<Response>) {
         let func = call.func.to_token_stream().to_string();
         if func == "Ok" {
             if call.args.len() == 1 {
-                return parse_call(call.args.iter().next().unwrap(), acc);
+                parse_call(call.args.iter().next().unwrap(), acc)
             }
         } else if func.starts_with("Response") {
             if func.contains("not_implemented") {
@@ -243,13 +243,13 @@ fn parse_call(expr: &Expr, acc: &mut Vec<Response>) {
     } else if let Expr::MethodCall(call) = expr {
         let mut builder = ResponseBuilder::default();
         parse_method_chain(call, &mut builder);
-        if !builder.ty.is_none() {
+        if builder.ty.is_some() {
             acc.push(builder.build());
         }
     } else if let Expr::If(expr_if) = expr {
         parse_block(expr_if.then_branch.stmts.clone(), acc);
         if let Some(ref else_expr) = expr_if.else_branch {
-            return parse_call(else_expr.1.as_ref(), acc);
+            parse_call(else_expr.1.as_ref(), acc)
         }
     } else if let Expr::Block(block) = expr {
         parse_block(block.block.stmts.clone(), acc)

rwf/src/model/cursor.rs

@@ -16,8 +16,11 @@ use tracing::{error, info, warn};
 
 /// An Enum declaring the direction the cursor will fetch (important if the cursor is scrollable) #
 /// and how far the cursor moves. Not Required to interact directly with
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Serialize, Deserialize, Hash)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Serialize, Deserialize, Hash, Default,
+)]
 pub enum FetchDirection {
+    #[default]
     NEXT,
     PRIOR,
     FIRST,
@@ -30,24 +33,18 @@ pub enum FetchDirection {
     BackwardAll,
 }
 
-impl Default for FetchDirection {
-    fn default() -> Self {
-        Self::NEXT
-    }
-}
-
 impl std::fmt::Display for FetchDirection {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::NEXT => write!(f, "NEXT"),
             Self::PRIOR => write!(f, "PRIOR"),
             Self::FIRST => write!(f, "FIRST"),
             Self::LAST => write!(f, "LAST"),
-            Self::ABSOLUTE(n) => write!(f, "{} {}", "ABSOLUTE", n),
-            Self::RELATIVE(n) => write!(f, "{} {}", "RELATIVE", n),
-            Self::FORWARD(n) => write!(f, "{} {}", "FORWARD", n),
+            Self::ABSOLUTE(n) => write!(f, "ABSOLUTE {}", n),
+            Self::RELATIVE(n) => write!(f, "RELATIVE {}", n),
+            Self::FORWARD(n) => write!(f, "FORWARD {}", n),
             Self::ForwardAll => write!(f, "FORWARD ALL"),
-            Self::BACKWARD(n) => write!(f, "{} {}", "BACKWARD", n),
+            Self::BACKWARD(n) => write!(f, "BACKWARD {}", n),
             Self::BackwardAll => write!(f, "BACKWARD ALL"),
         }
     }
@@ -133,9 +130,12 @@ impl FetchDirection {
 
 /// An Enum declaring whether the cursor shall fetch entries or just move its position.
 /// Not Required to interact directly with.
-#[derive(Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
+#[derive(
+    Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize, Default,
+)]
 pub enum FetchCmd {
     Move,
+    #[default]
     Fetch,
 }
 
@@ -148,12 +148,6 @@ impl std::fmt::Display for FetchCmd {
     }
 }
 
-impl Default for FetchCmd {
-    fn default() -> Self {
-        Self::Fetch
-    }
-}
-
 impl ToSql for FetchCmd {
     fn to_sql(&self) -> String {
         format!("{}", self)
@@ -409,17 +403,13 @@ impl FetchStmt {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Serialize, Deserialize, Default)]
 pub enum Sensitivity {
+    #[default]
     INSENSITIVE,
     ASENSITIVE,
     SENSITIVE,
 }
-impl Default for Sensitivity {
-    fn default() -> Self {
-        Self::INSENSITIVE
-    }
-}
 
 impl std::fmt::Display for Sensitivity {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -435,7 +425,7 @@ impl ToSql for Sensitivity {
     fn to_sql(&self) -> String {
         match self {
             Self::SENSITIVE => unimplemented!("Postgres has no support for SENSITIVE Cursors. SENSITIVE is only implemented for compability with the SQL Standard"),
-            sensitivity => format!(" {} ", sensitivity.to_string())
+            sensitivity => format!(" {} ", sensitivity)
         }
     }
 }
@@ -867,8 +857,8 @@ impl<T: Model> ToSql for DeclareCursor<T> {
             r#"DECLARE "{}" BINARY{}{}SCROLL CURSOR {} HOLD FOR {}"#,
             self.name.escape(),
             self.sensitivity.to_sql(),
-            self.scroll.then(|| "").unwrap_or("NO "),
-            self.hold.then(|| "WITH").unwrap_or("WITHOUT"),
+            if self.scroll { "" } else { "NO " },
+            if self.hold { "WITH" } else { "WITHOUT" },
             self.query.to_sql()
         )
     }
@@ -918,7 +908,7 @@ impl Clone for CursorData {
     fn clone(&self) -> Self {
         Self {
             meta: self.meta.clone(),
-            used: self.used.clone(),
+            used: self.used,
             position: AtomicI64::new(self.position.load(std::sync::atomic::Ordering::Relaxed)),
             fetched: AtomicI64::new(self.fetched.load(std::sync::atomic::Ordering::Relaxed)),
         }
@@ -978,7 +968,7 @@ impl Cursor for CursorData {
     fn fetched(&self) -> i64 {
         self.fetched.load(std::sync::atomic::Ordering::Relaxed)
     }
-    fn update_used(&mut self) -> () {
+    fn update_used(&mut self) {
         self.used = Instant::now();
     }
     fn get_position_mut(&mut self) -> &mut AtomicI64 {
@@ -1178,13 +1168,13 @@ pub trait Cursor: Sync + Send {
     /// The number of fetched Records by the Server
     fn fetched(&self) -> i64;
     /// Updates the Cursor Stats. Warps `update_position` `update_used` and `update_fetched`
-    fn update(&mut self, fd: FetchDirection, row_count: i64) -> () {
+    fn update(&mut self, fd: FetchDirection, row_count: i64) {
         self.update_used();
         self.update_fetched(row_count);
         self.update_position(fd.to_position_update(&row_count));
     }
     /// Adjust the current Position of the Cursor
-    fn update_position(&mut self, fd: FetchDirection) -> () {
+    fn update_position(&mut self, fd: FetchDirection) {
         use FetchDirection::*;
         let order = std::sync::atomic::Ordering::Relaxed;
         let cur = self.get_position_mut();
@@ -1202,7 +1192,7 @@ pub trait Cursor: Sync + Send {
         };
     }
     /// Increase the number of fetched records
-    fn update_fetched(&mut self, count: i64) -> () {
+    fn update_fetched(&mut self, count: i64) {
         self.get_fetched_mut()
             .fetch_add(count, std::sync::atomic::Ordering::Relaxed);
     }

rwf/src/model/delete.rs

@@ -124,7 +124,7 @@ impl<T: Model, C: ToColumn, V: ToValue> FromIterator<(C, V)> for Delete<T> {
 impl<T: Model, C: ToColumn, V: ToValue> From<&[(C, V)]> for Delete<T> {
     fn from(v: &[(C, V)]) -> Self {
         Self::from_iter(
-            v.into_iter()
+            v.iter()
                 .map(|(c, v)| (c.to_column(), v.to_value()))
                 .collect::<Vec<_>>(),
         )

rwf/src/model/join.rs

@@ -151,12 +151,12 @@ impl ToSql for Join {
     fn to_sql(&self) -> String {
         format!(
             r#"{} "{}"{} ON {} = {}"#,
-            self.kind.to_string(),
+            self.kind,
             self.table_name.escape(),
             self.alias
                 .as_ref()
                 .map(|alias| format!(r#" AS "{}""#, alias.escape()))
-                .unwrap_or(String::new()),
+                .unwrap_or_default(),
             self.table_column.to_sql(),
             self.foreign_column.to_sql(),
         )

rwf/src/model/migrations/bootstrap.rs

@@ -86,15 +86,15 @@ pub(crate) fn parse_database_schema(data: &str) -> RwfDatabaseSchema {
             .unwrap()
             .as_sequence()
             .unwrap()
-            .into_iter()
+            .iter()
             .map(|val| val.as_str().unwrap().to_string())
             .collect(),
         down: yaml
             .get("down")
             .unwrap()
             .as_sequence()
             .unwrap()
-            .into_iter()
+            .iter()
             .map(|val| val.as_str().unwrap().to_string())
             .collect(),
         description: yaml
@@ -297,7 +297,7 @@ impl RwfDatabaseSchema {
             if log_queries {
                 info!("{}", stmt);
             }
-            tx.query_cached(&stmt, &[]).await?;
+            tx.query_cached(stmt, &[]).await?;
         }
         migrate.fetch(tx).await?;
         Ok(())

rwf/src/model/temporary.rs

@@ -51,7 +51,7 @@ impl TemporaryQuery {
     pub fn offset(&self) -> i32 {
         self.offset
     }
-    pub fn fields(&mut self, fields: Vec<Column>) -> () {
+    pub fn fields(&mut self, fields: Vec<Column>) {
         self.fields = fields
             .into_iter()
             .map(|col| Column::name(col.get_name()))
@@ -164,7 +164,7 @@ impl<T: FromRow> ToTemporaryQuery for Query<T> {
                 mut query,
                 placeholders,
             } => {
-                let mut val_placeholders = (1..placeholders.id()).into_iter().collect::<Vec<i32>>();
+                let mut val_placeholders = (1..placeholders.id()).collect::<Vec<i32>>();
                 val_placeholders.reverse();
                 for (idx, placeholder) in val_placeholders.iter().enumerate() {
                     query = query.replace(