formatting

Author: bobozaur

sqlx-macros-core/src/derives/decode.rs

@@ -8,7 +8,8 @@ use quote::quote;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
 use syn::{
-    parse_quote, Arm, Data, DataEnum, DataStruct, DeriveInput, Field, Fields, FieldsNamed, FieldsUnnamed, Ident, Stmt, TypeParamBound, Variant
+    parse_quote, Arm, Data, DataEnum, DataStruct, DeriveInput, Field, Fields, FieldsNamed,
+    FieldsUnnamed, Ident, Stmt, TypeParamBound, Variant,
 };
 
 pub fn expand_derive_decode(input: &DeriveInput, crate_name: &Ident) -> syn::Result<TokenStream> {
@@ -49,7 +50,7 @@ pub fn expand_derive_decode(input: &DeriveInput, crate_name: &Ident) -> syn::Res
 fn expand_derive_decode_transparent(
     input: &DeriveInput,
     field: &Field,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     check_transparent_attributes(input, field)?;
 
@@ -142,7 +143,7 @@ fn expand_derive_decode_weak_enum(
 fn expand_derive_decode_strong_enum(
     input: &DeriveInput,
     variants: &Punctuated<Variant, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     let cattr = check_strong_enum_attributes(input, variants)?;
 
@@ -259,7 +260,7 @@ fn expand_derive_decode_strong_enum(
 fn expand_derive_decode_struct(
     input: &DeriveInput,
     fields: &Punctuated<Field, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     check_struct_attributes(input, fields)?;
 

sqlx-macros-core/src/derives/encode.rs

@@ -8,7 +8,8 @@ use quote::quote;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
 use syn::{
-    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Expr, Field, Fields, FieldsNamed, FieldsUnnamed, Ident, Lifetime, LifetimeParam, Stmt, TypeParamBound, Variant
+    parse_quote, Data, DataEnum, DataStruct, DeriveInput, Expr, Field, Fields, FieldsNamed,
+    FieldsUnnamed, Ident, Lifetime, LifetimeParam, Stmt, TypeParamBound, Variant,
 };
 
 pub fn expand_derive_encode(input: &DeriveInput, crate_name: &Ident) -> syn::Result<TokenStream> {
@@ -143,7 +144,7 @@ fn expand_derive_encode_weak_enum(
 fn expand_derive_encode_strong_enum(
     input: &DeriveInput,
     variants: &Punctuated<Variant, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     let cattr = check_strong_enum_attributes(input, variants)?;
 
@@ -198,7 +199,7 @@ fn expand_derive_encode_strong_enum(
 fn expand_derive_encode_struct(
     input: &DeriveInput,
     fields: &Punctuated<Field, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     check_struct_attributes(input, fields)?;
 

sqlx-macros-core/src/derives/mod.rs

@@ -14,7 +14,10 @@ use heck::{ToKebabCase, ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase, ToUppe
 use proc_macro2::TokenStream;
 use syn::{DeriveInput, Ident};
 
-pub fn expand_derive_type_encode_decode(input: &DeriveInput, crate_name: Ident) -> syn::Result<TokenStream> {
+pub fn expand_derive_type_encode_decode(
+    input: &DeriveInput,
+    crate_name: Ident,
+) -> syn::Result<TokenStream> {
     let encode_tts = expand_derive_encode(input, &crate_name)?;
     let decode_tts = expand_derive_decode(input, &crate_name)?;
     let type_tts = expand_derive_type(input, &crate_name)?;

sqlx-macros-core/src/derives/row.rs

@@ -1,7 +1,8 @@
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::{
-    parse_quote, punctuated::Punctuated, token::Comma, Data, DataStruct, DeriveInput, Expr, Field, Fields, FieldsNamed, FieldsUnnamed, Ident, Lifetime, Stmt
+    parse_quote, punctuated::Punctuated, token::Comma, Data, DataStruct, DeriveInput, Expr, Field,
+    Fields, FieldsNamed, FieldsUnnamed, Ident, Lifetime, Stmt,
 };
 
 use super::{
@@ -53,7 +54,9 @@ fn expand_derive_from_row_struct(
     let (_, ty_generics, _) = generics.split_for_impl();
 
     let mut generics = generics.clone();
-    generics.params.insert(0, parse_quote!(R: ::#crate_name::Row));
+    generics
+        .params
+        .insert(0, parse_quote!(R: ::#crate_name::Row));
 
     if provided {
         generics.params.insert(0, parse_quote!(#lifetime));
@@ -137,7 +140,7 @@ fn expand_derive_from_row_struct(
                 (false, Some(try_from), None) => {
                     predicates
                         .push(parse_quote!(#try_from: ::#crate_name::decode::Decode<#lifetime, R::Database>));
-                    predicates.push(parse_quote!(#try_from: ::#crate_name::types::Type<R::Database>)); 
+                    predicates.push(parse_quote!(#try_from: ::#crate_name::types::Type<R::Database>));
 
                     parse_quote!(
                         __row.try_get(#id_s)
@@ -245,7 +248,7 @@ fn expand_derive_from_row_struct(
 fn expand_derive_from_row_struct_unnamed(
     input: &DeriveInput,
     fields: &Punctuated<Field, Comma>,
-    crate_name: Ident
+    crate_name: Ident,
 ) -> syn::Result<TokenStream> {
     let ident = &input.ident;
 
@@ -260,7 +263,9 @@ fn expand_derive_from_row_struct_unnamed(
     let (_, ty_generics, _) = generics.split_for_impl();
 
     let mut generics = generics.clone();
-    generics.params.insert(0, parse_quote!(R: ::#crate_name::Row));
+    generics
+        .params
+        .insert(0, parse_quote!(R: ::#crate_name::Row));
 
     if provided {
         generics.params.insert(0, parse_quote!(#lifetime));

sqlx-macros-core/src/derives/type.rs

@@ -134,7 +134,7 @@ fn expand_derive_has_sql_type_transparent(
 fn expand_derive_has_sql_type_weak_enum(
     input: &DeriveInput,
     variants: &Punctuated<Variant, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     let attrs = check_weak_enum_attributes(input, variants)?;
     let repr = attrs.repr.unwrap();
@@ -172,7 +172,7 @@ fn expand_derive_has_sql_type_weak_enum(
 fn expand_derive_has_sql_type_strong_enum(
     input: &DeriveInput,
     variants: &Punctuated<Variant, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     let attributes = check_strong_enum_attributes(input, variants)?;
 
@@ -235,7 +235,7 @@ fn expand_derive_has_sql_type_strong_enum(
 fn expand_derive_has_sql_type_struct(
     input: &DeriveInput,
     fields: &Punctuated<Field, Comma>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> syn::Result<TokenStream> {
     let attributes = check_struct_attributes(input, fields)?;
 

sqlx-macros-core/src/query/args.rs

@@ -17,7 +17,7 @@ pub fn quote_args<DB: DatabaseExt>(
     config: &Config,
     warnings: &mut Warnings,
     info: &Describe<DB>,
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> crate::Result<TokenStream> {
     let db_path = DB::db_path();
 

sqlx-macros-core/src/query/mod.rs

@@ -223,7 +223,7 @@ fn expand_with<DB: DatabaseExt>(
     config: &Config,
     input: QueryMacroInput,
     data_source: QueryDataSource,
-    crate_name: Ident
+    crate_name: Ident,
 ) -> crate::Result<TokenStream>
 where
     Describe<DB>: DescribeExt,
@@ -331,7 +331,7 @@ where
                     &record_name,
                     &query_args,
                     &columns,
-                    &crate_name
+                    &crate_name,
                 ));
 
                 record_tokens
@@ -347,7 +347,7 @@ where
                 &mut warnings,
                 &query_args,
                 &data.describe,
-                &crate_name
+                &crate_name,
             )?,
         }
     };

sqlx-macros-core/src/query/output.rs

@@ -141,7 +141,7 @@ pub fn quote_query_as<DB: DatabaseExt>(
     out_ty: &Type,
     bind_args: &Ident,
     columns: &[RustColumn],
-    crate_name: &Ident
+    crate_name: &Ident,
 ) -> TokenStream {
     let instantiations = columns.iter().enumerate().map(
         |(

sqlx-macros-core/src/test_attr.rs

@@ -26,7 +26,11 @@ enum MigrationsOpt {
 
 type AttributeArgs = syn::punctuated::Punctuated<syn::Meta, syn::Token![,]>;
 
-pub fn expand(args: TokenStream, input: syn::ItemFn, crate_name: Ident) -> crate::Result<TokenStream> {
+pub fn expand(
+    args: TokenStream,
+    input: syn::ItemFn,
+    crate_name: Ident,
+) -> crate::Result<TokenStream> {
     let parser = AttributeArgs::parse_terminated;
     let args = parser.parse2(args)?;
 
@@ -76,7 +80,11 @@ fn expand_simple(input: syn::ItemFn, crate_name: Ident) -> TokenStream {
 }
 
 #[cfg(feature = "migrate")]
-fn expand_advanced(args: AttributeArgs, input: syn::ItemFn, crate_name: Ident) -> crate::Result<TokenStream> {
+fn expand_advanced(
+    args: AttributeArgs,
+    input: syn::ItemFn,
+    crate_name: Ident,
+) -> crate::Result<TokenStream> {
     let config = sqlx_core::config::Config::try_from_crate_or_default()?;
 
     let ret = &input.sig.output;
@@ -154,7 +162,8 @@ fn expand_advanced(args: AttributeArgs, input: syn::ItemFn, crate_name: Ident) -
             let resolved_path = crate::common::resolve_path(path, proc_macro2::Span::call_site())?;
 
             if resolved_path.is_dir() {
-                let migrator = crate::migrate::expand_with_path(&config, &resolved_path, &crate_name)?;
+                let migrator =
+                    crate::migrate::expand_with_path(&config, &resolved_path, &crate_name)?;
                 quote! { args.migrator(&#migrator); }
             } else {
                 quote! {}

sqlx-macros/src/lib.rs

@@ -132,7 +132,7 @@ mod tests {
         /// This must be set as `SQLX_NAMESPACE` environment variable to test that
         /// changing the namespace still results in the proc macros behaving well.
         extern crate sqlx as external;
-        
+
         #[derive(Debug, external::Type, external::Encode, external::Decode, external::FromRow)]
         struct Test {}
     }