fix(BREAKING): make clippy happy

Author: jvatic

src/diff.rs

@@ -11,8 +11,8 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub struct DiffError {
     kind: DiffErrorKind,
-    statement_a: Option<Statement>,
-    statement_b: Option<Statement>,
+    statement_a: Option<Box<Statement>>,
+    statement_b: Option<Box<Statement>>,
 }
 
 impl fmt::Display for DiffError {
@@ -42,8 +42,8 @@ impl DiffError {
     ) -> Self {
         Self {
             kind,
-            statement_a,
-            statement_b,
+            statement_a: statement_a.map(Box::new),
+            statement_b: statement_b.map(Box::new),
         }
     }
 }

src/lib.rs

@@ -138,20 +138,20 @@ mod tests {
         F: Fn(SyntaxTree, SyntaxTree) -> SyntaxTree,
     {
         let ast_a = SyntaxTree::builder()
-            .dialect(tc.dialect.clone())
+            .dialect(tc.dialect)
             .sql(tc.sql_a)
             .build()
             .unwrap();
         let ast_b = SyntaxTree::builder()
-            .dialect(tc.dialect.clone())
+            .dialect(tc.dialect)
             .sql(tc.sql_b)
             .build()
             .unwrap();
         SyntaxTree::builder()
-            .dialect(tc.dialect.clone())
+            .dialect(tc.dialect)
             .sql(tc.expect)
             .build()
-            .expect(format!("invalid SQL: {:?}", tc.expect).as_str());
+            .unwrap_or_else(|_| panic!("invalid SQL: {:?}", tc.expect));
         let actual = testfn(ast_a, ast_b);
         assert_eq!(actual.to_string(), tc.expect, "{tc:?}");
     }

src/migration.rs

@@ -11,8 +11,8 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub struct MigrateError {
     kind: MigrateErrorKind,
-    statement_a: Option<Statement>,
-    statement_b: Option<Statement>,
+    statement_a: Option<Box<Statement>>,
+    statement_b: Option<Box<Statement>>,
 }
 
 impl fmt::Display for MigrateError {
@@ -42,8 +42,8 @@ impl MigrateError {
     ) -> Self {
         Self {
             kind,
-            statement_a,
-            statement_b,
+            statement_a: statement_a.map(Box::new),
+            statement_b: statement_b.map(Box::new),
         }
     }
 }
@@ -54,9 +54,9 @@ enum MigrateErrorKind {
     #[error("can't migrate unnamed index")]
     UnnamedIndex,
     #[error("ALTER TABLE operation \"{0}\" not yet supported")]
-    AlterTableOpNotImplemented(AlterTableOperation),
+    AlterTableOpNotImplemented(Box<AlterTableOperation>),
     #[error("invalid ALTER TYPE operation \"{0}\"")]
-    AlterTypeInvalidOp(AlterTypeOperation),
+    AlterTypeInvalidOp(Box<AlterTypeOperation>),
     #[error("not yet supported")]
     NotImplemented,
 }
@@ -325,7 +325,9 @@ fn migrate_alter_table(
             }
             op => {
                 return Err(MigrateError::builder()
-                    .kind(MigrateErrorKind::AlterTableOpNotImplemented(op.clone()))
+                    .kind(MigrateErrorKind::AlterTableOpNotImplemented(Box::new(
+                        op.clone(),
+                    )))
                     .statement_a(Statement::CreateTable(t.clone()))
                     .build())
             }
@@ -380,9 +382,9 @@ fn migrate_alter_type(
                 Ok((name, UserDefinedTypeRepresentation::Enum { labels }))
             }
             UserDefinedTypeRepresentation::Composite { .. } => Err(MigrateError::builder()
-                .kind(MigrateErrorKind::AlterTypeInvalidOp(
+                .kind(MigrateErrorKind::AlterTypeInvalidOp(Box::new(
                     other.operation.clone(),
-                ))
+                )))
                 .statement_a(Statement::CreateType {
                     name,
                     representation,
@@ -400,9 +402,9 @@ fn migrate_alter_type(
                 Ok((name, UserDefinedTypeRepresentation::Enum { labels }))
             }
             UserDefinedTypeRepresentation::Composite { .. } => Err(MigrateError::builder()
-                .kind(MigrateErrorKind::AlterTypeInvalidOp(
+                .kind(MigrateErrorKind::AlterTypeInvalidOp(Box::new(
                     other.operation.clone(),
-                ))
+                )))
                 .statement_a(Statement::CreateType {
                     name,
                     representation,

src/path_template.rs

@@ -1070,8 +1070,7 @@ mod tests {
         let mut timestamp = data.timestamp;
         tmpl.segments
             .iter()
-            .map(|s| &s.tokens)
-            .flatten()
+            .flat_map(|s| &s.tokens)
             .for_each(|t| {
                 match t {
                     Token::Timestamp(ts) => timestamp = ts.clone().try_into().unwrap(),
@@ -1156,7 +1155,7 @@ mod tests {
             eprintln!("{input:?}");
             let template = super::parser::parse(input)
                 .context(format!("test case {i:02}"))
-                .expect(format!("{input} should parse").as_str());
+                .unwrap_or_else(|_| panic!("{input} should parse"));
             let data = data(&template);
             let template = template.with_up_down();
             let out = template.resolve(&data);