refactor(code): have less new-lines in impl block section

this may be opinionated
Wulf · Oct 30, 2023 · 4a64dfe · 4a64dfe
1 parent 77ce422
commit 4a64dfe
Show file tree

Hide file tree

Showing 28 changed files with 3 additions and 69 deletions.
diff --git a/src/code.rs b/src/code.rs
@@ -420,13 +420,10 @@ fn build_table_fns(
 
     if !config.once_common_structs {
         buffer.push_str(&generate_common_structs(&table_options));
+        buffer.push('\n');
     }
 
-    buffer.push_str(&format!(
-        r##"
-impl {struct_name} {{
-"##
-    ));
+    buffer.push_str(&format!("impl {struct_name} {{"));
 
     if !is_readonly {
         if create_struct.has_fields() {
@@ -512,10 +509,7 @@ impl {struct_name} {{
         ));
     }
 
-    buffer.push_str(
-        r##"
-}"##,
-    );
+    buffer.push('}');
 
     buffer
 }

diff --git a/test/autogenerated_all/models/todos/generated.rs b/test/autogenerated_all/models/todos/generated.rs
@@ -32,7 +32,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -74,5 +73,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/autogenerated_attributes/models/todos/generated.rs b/test/autogenerated_attributes/models/todos/generated.rs
@@ -38,7 +38,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -80,5 +79,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/autogenerated_primary_keys/models/todos/generated.rs b/test/autogenerated_primary_keys/models/todos/generated.rs
@@ -38,7 +38,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -80,5 +79,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/cleanup_generated_content/models/todos/generated.rs b/test/cleanup_generated_content/models/todos/generated.rs
@@ -46,7 +46,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -88,5 +87,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/create_update_str_cow/models/todos/generated.rs b/test/create_update_str_cow/models/todos/generated.rs
@@ -45,7 +45,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -87,5 +86,4 @@ impl Todos {
 
         diesel::delete(todos.filter(text.eq(param_text))).execute(db)
     }
-
 }
diff --git a/test/create_update_str_str/models/todos/generated.rs b/test/create_update_str_str/models/todos/generated.rs
@@ -45,7 +45,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -87,5 +86,4 @@ impl Todos {
 
         diesel::delete(todos.filter(text.eq(param_text))).execute(db)
     }
-
 }
diff --git a/test/custom_model_and_schema_path/models/tableA/generated.rs b/test/custom_model_and_schema_path/models/tableA/generated.rs
@@ -31,7 +31,6 @@ pub struct PaginationResult<T> {
 }
 
 impl TableA {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTableA) -> QueryResult<Self> {
         use crate::data::schema::tableA::dsl::*;
 
@@ -67,5 +66,4 @@ impl TableA {
 
         diesel::delete(tableA.filter(_id.eq(param__id))).execute(db)
     }
-
 }
diff --git a/test/custom_model_and_schema_path/models/tableB/generated.rs b/test/custom_model_and_schema_path/models/tableB/generated.rs
@@ -40,7 +40,6 @@ pub struct PaginationResult<T> {
 }
 
 impl TableB {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTableB) -> QueryResult<Self> {
         use crate::data::schema::tableB::dsl::*;
 
@@ -82,5 +81,4 @@ impl TableB {
 
         diesel::delete(tableB.filter(_id.eq(param__id))).execute(db)
     }
-
 }
diff --git a/test/custom_model_path/models/tableA/generated.rs b/test/custom_model_path/models/tableA/generated.rs
@@ -31,7 +31,6 @@ pub struct PaginationResult<T> {
 }
 
 impl TableA {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTableA) -> QueryResult<Self> {
         use crate::schema::tableA::dsl::*;
 
@@ -67,5 +66,4 @@ impl TableA {
 
         diesel::delete(tableA.filter(_id.eq(param__id))).execute(db)
     }
-
 }
diff --git a/test/custom_model_path/models/tableB/generated.rs b/test/custom_model_path/models/tableB/generated.rs
@@ -40,7 +40,6 @@ pub struct PaginationResult<T> {
 }
 
 impl TableB {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTableB) -> QueryResult<Self> {
         use crate::schema::tableB::dsl::*;
 
@@ -82,5 +81,4 @@ impl TableB {
 
         diesel::delete(tableB.filter(_id.eq(param__id))).execute(db)
     }
-
 }
diff --git a/test/manual_primary_keys/models/todos/generated.rs b/test/manual_primary_keys/models/todos/generated.rs
@@ -31,7 +31,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -67,5 +66,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/multiple_primary_keys/models/users/generated.rs b/test/multiple_primary_keys/models/users/generated.rs
@@ -41,7 +41,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Users {
-
     pub fn create(db: &mut ConnectionType, item: &CreateUsers) -> QueryResult<Self> {
         use crate::schema::users::dsl::*;
 
@@ -83,5 +82,4 @@ impl Users {
 
         diesel::delete(users.filter(name.eq(param_name)).filter(address.eq(param_address))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs/models/table1/generated.rs b/test/once_common_structs/models/table1/generated.rs
@@ -14,9 +14,7 @@ pub struct Table1 {
     pub id: i32,
 }
 
-
 impl Table1 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table1::dsl::*;
 
@@ -52,5 +50,4 @@ impl Table1 {
 
         diesel::delete(table1.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs/models/table2/generated.rs b/test/once_common_structs/models/table2/generated.rs
@@ -14,9 +14,7 @@ pub struct Table2 {
     pub id: i32,
 }
 
-
 impl Table2 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table2::dsl::*;
 
@@ -52,5 +50,4 @@ impl Table2 {
 
         diesel::delete(table2.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs_once_connection_type/models/table1/generated.rs b/test/once_common_structs_once_connection_type/models/table1/generated.rs
@@ -12,9 +12,7 @@ pub struct Table1 {
     pub id: i32,
 }
 
-
 impl Table1 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table1::dsl::*;
 
@@ -50,5 +48,4 @@ impl Table1 {
 
         diesel::delete(table1.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs_once_connection_type/models/table2/generated.rs b/test/once_common_structs_once_connection_type/models/table2/generated.rs
@@ -12,9 +12,7 @@ pub struct Table2 {
     pub id: i32,
 }
 
-
 impl Table2 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table2::dsl::*;
 
@@ -50,5 +48,4 @@ impl Table2 {
 
         diesel::delete(table2.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs_once_connection_type_single_file/models/table1.rs b/test/once_common_structs_once_connection_type_single_file/models/table1.rs
@@ -12,9 +12,7 @@ pub struct Table1 {
     pub id: i32,
 }
 
-
 impl Table1 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table1::dsl::*;
 
@@ -50,5 +48,4 @@ impl Table1 {
 
         diesel::delete(table1.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_common_structs_once_connection_type_single_file/models/table2.rs b/test/once_common_structs_once_connection_type_single_file/models/table2.rs
@@ -12,9 +12,7 @@ pub struct Table2 {
     pub id: i32,
 }
 
-
 impl Table2 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table2::dsl::*;
 
@@ -50,5 +48,4 @@ impl Table2 {
 
         diesel::delete(table2.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_connection_type/models/table1/generated.rs b/test/once_connection_type/models/table1/generated.rs
@@ -24,7 +24,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Table1 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table1::dsl::*;
 
@@ -60,5 +59,4 @@ impl Table1 {
 
         diesel::delete(table1.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/once_connection_type/models/table2/generated.rs b/test/once_connection_type/models/table2/generated.rs
@@ -24,7 +24,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Table2 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table2::dsl::*;
 
@@ -60,5 +59,4 @@ impl Table2 {
 
         diesel::delete(table2.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/simple_table/models/todos/generated.rs b/test/simple_table/models/todos/generated.rs
@@ -54,7 +54,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -96,5 +95,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/simple_table_async/models/todos/generated.rs b/test/simple_table_async/models/todos/generated.rs
@@ -49,7 +49,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub async fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -91,5 +90,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db).await
     }
-
 }
diff --git a/test/simple_table_custom_schema_path/models/todos/generated.rs b/test/simple_table_custom_schema_path/models/todos/generated.rs
@@ -48,7 +48,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::data::schema::todos::dsl::*;
 
@@ -90,5 +89,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/simple_table_no_serde/models/todos/generated.rs b/test/simple_table_no_serde/models/todos/generated.rs
@@ -47,7 +47,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Todos {
-
     pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
@@ -89,5 +88,4 @@ impl Todos {
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)
     }
-
 }
diff --git a/test/single_model_file/models/table1.rs b/test/single_model_file/models/table1.rs
@@ -25,7 +25,6 @@ pub struct PaginationResult<T> {
 }
 
 impl Table1 {
-
     pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
         use crate::schema::table1::dsl::*;
 
@@ -61,5 +60,4 @@ impl Table1 {
 
         diesel::delete(table1.filter(id.eq(param_id))).execute(db)
     }
-
 }