Kestrel пре 2 година
родитељ
комит
75021152c7
3 измењених фајлова са 5 додато и 5 уклоњено
  1. 3 3
      microrm-macros/src/entity.rs
  2. 1 1
      microrm-macros/src/index.rs
  3. 1 1
      microrm-macros/src/modelable.rs

+ 3 - 3
microrm-macros/src/entity.rs

@@ -34,7 +34,7 @@ fn derive_columns<'a, I: Iterator<Item = &'a syn::Field>>(
         let original_case = name.ident.as_ref().unwrap().clone();
         let snake_case = original_case.to_string();
         if snake_case != snake_case.to_case(Case::Snake) {
-            return quote::quote_spanned!(original_case.span() => compile_error!("Names must be in snake_case")).into();
+            return quote::quote_spanned!(original_case.span() => compile_error!("Names must be in snake_case"))
         }
 
         let converted_case =
@@ -137,7 +137,7 @@ fn derive_id(
                 "integer"
             }
         }
-    }.into()
+    }
 }
 
 pub(crate) fn derive(tokens: TokenStream) -> TokenStream {
@@ -175,7 +175,7 @@ pub(crate) fn derive(tokens: TokenStream) -> TokenStream {
         let original_case = name.ident.as_ref().unwrap().clone();
         let snake_case = original_case.to_string().to_case(Case::Snake);
 
-        if original_case.to_string() != snake_case {
+        if original_case != snake_case {
             return quote::quote_spanned!(original_case.span() => compile_error!("Names must be in snake_case")).into();
         }
 

+ 1 - 1
microrm-macros/src/index.rs

@@ -43,7 +43,7 @@ pub(crate) fn do_make_index(
         "INDEX_COLUMN_NAMES_{}",
         index_struct_name.to_string().to_case(Case::ScreamingSnake)
     );
-    let column_count = columns.clone().len();
+    let column_count = columns.len();
 
     quote! {
         pub struct #index_struct_name ();

+ 1 - 1
microrm-macros/src/modelable.rs

@@ -1,5 +1,5 @@
 use proc_macro::TokenStream;
-use quote::{format_ident, quote};
+use quote::quote;
 use syn::{parse_macro_input, DeriveInput};
 
 pub fn derive(tokens: TokenStream) -> TokenStream {