Skip to content

Commit 79034b4

Browse files
committed
fmt
1 parent c6a4351 commit 79034b4

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

sqlx-macros/src/derives/attributes.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ use quote::{quote, quote_spanned};
33
use syn::punctuated::Punctuated;
44
use syn::spanned::Spanned;
55
use syn::token::Comma;
6-
use syn::{Attribute, DeriveInput, Field, Lit, Meta, MetaNameValue, Variant, Expr, LitStr, Token, Path};
6+
use syn::{
7+
Attribute, DeriveInput, Expr, Field, Lit, LitStr, Meta, MetaNameValue, Path, Token, Variant,
8+
};
79

810
macro_rules! assert_attribute {
911
($e:expr, $err:expr, $input:expr) => {
@@ -87,7 +89,8 @@ pub fn parse_container_attributes(input: &[Attribute]) -> syn::Result<SqlxContai
8789
{
8890
match &attr.meta {
8991
Meta::List(list) if list.path.is_ident("sqlx") => {
90-
let nested_metas = list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
92+
let nested_metas =
93+
list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
9194
for meta_item in nested_metas {
9295
match meta_item {
9396
Meta::Path(p) if p.is_ident("transparent") => {
@@ -157,7 +160,8 @@ pub fn parse_container_attributes(input: &[Attribute]) -> syn::Result<SqlxContai
157160
}
158161
}
159162
Meta::List(list) if list.path.is_ident("repr") => {
160-
let nested_metas = list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
163+
let nested_metas =
164+
list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
161165
if nested_metas.len() != 1 {
162166
fail!(&list.path, "expected one value for repr")
163167
}
@@ -188,7 +192,8 @@ pub fn parse_child_attributes(input: &[Attribute]) -> syn::Result<SqlxChildAttri
188192

189193
for attr in input.iter().filter(|a| a.path().is_ident("sqlx")) {
190194
if let Meta::List(list) = &attr.meta {
191-
let nested_metas = list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
195+
let nested_metas =
196+
list.parse_args_with(Punctuated::<Meta, syn::token::Comma>::parse_terminated)?;
192197
for meta_item in nested_metas {
193198
match meta_item {
194199
Meta::NameValue(mnv) if mnv.path.is_ident("rename") => {

sqlx-macros/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use proc_macro::TokenStream;
1313
use quote::quote;
1414

1515
use syn::parse::{Parse, ParseStream};
16-
use syn::{parse_macro_input, DeriveInput, ItemFn, LitStr, Token, Meta};
1716
use syn::punctuated::Punctuated;
17+
use syn::{parse_macro_input, DeriveInput, ItemFn, LitStr, Meta, Token};
1818

1919
type Error = Box<dyn std::error::Error>;
2020

@@ -35,7 +35,9 @@ struct ArgsParser(Punctuated<Meta, Token![,]>);
3535

3636
impl Parse for ArgsParser {
3737
fn parse(input: ParseStream) -> syn::Result<Self> {
38-
Ok(ArgsParser(Punctuated::<Meta, Token![,]>::parse_terminated(input)?))
38+
Ok(ArgsParser(Punctuated::<Meta, Token![,]>::parse_terminated(
39+
input,
40+
)?))
3941
}
4042
}
4143

sqlx-macros/src/test_attr.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use proc_macro2::{Span, TokenStream};
22
use quote::quote;
3-
use syn::{LitStr, LitBool, Expr, Meta, MetaList, MetaNameValue, Path, Token};
43
use syn::punctuated::Punctuated;
4+
use syn::{Expr, LitBool, LitStr, Meta, MetaList, MetaNameValue, Path, Token};
55

66
struct Args {
77
fixtures: Vec<LitStr>,
@@ -15,7 +15,10 @@ enum MigrationsOpt {
1515
Disabled,
1616
}
1717

18-
pub fn expand(args: Punctuated<syn::Meta, Token![,]>, input: syn::ItemFn) -> proc_macro::TokenStream {
18+
pub fn expand(
19+
args: Punctuated<syn::Meta, Token![,]>,
20+
input: syn::ItemFn,
21+
) -> proc_macro::TokenStream {
1922
let result: crate::Result<TokenStream> = if input.sig.inputs.is_empty() {
2023
if !args.is_empty() {
2124
if cfg!(feature = "migrate") {
@@ -24,13 +27,15 @@ pub fn expand(args: Punctuated<syn::Meta, Token![,]>, input: syn::ItemFn) -> pro
2427
"control attributes are not allowed unless \
2528
the `migrate` feature is enabled and \
2629
automatic test DB management is used; see docs",
27-
).into())
30+
)
31+
.into())
2832
} else {
2933
Err(syn::Error::new_spanned(
3034
args.first().unwrap(),
3135
"control attributes are not allowed unless \
3236
automatic test DB management is used; see docs",
33-
).into())
37+
)
38+
.into())
3439
}
3540
} else {
3641
expand_simple(input)
@@ -76,7 +81,10 @@ fn expand_simple(input: syn::ItemFn) -> crate::Result<TokenStream> {
7681
}
7782

7883
#[cfg(feature = "migrate")]
79-
fn expand_advanced(args: Punctuated<syn::Meta, Token![,]>, input: syn::ItemFn) -> crate::Result<TokenStream> {
84+
fn expand_advanced(
85+
args: Punctuated<syn::Meta, Token![,]>,
86+
input: syn::ItemFn,
87+
) -> crate::Result<TokenStream> {
8088
let ret = &input.sig.output;
8189
let name = &input.sig.ident;
8290
let inputs = &input.sig.inputs;

0 commit comments

Comments
 (0)