Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2853157

Browse files
sabifypaolobarbolini
sabify
authored and
paolobarbolini
committed
fix: cargo fmt --all
1 parent c8f8993 commit 2853157

44 files changed

Lines changed: 158 additions & 159 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎postgres-derive-test/src/enums.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::test_type;
2-
use postgres::{error::DbError, Client, NoTls};
2+
use postgres::{Client, NoTls, error::DbError};
33
use postgres_types::{FromSql, ToSql, WrongType};
44
use std::error::Error;
55

‎postgres-derive/src/composites.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use proc_macro2::Span;
22
use syn::{
3-
punctuated::Punctuated, Error, GenericParam, Generics, Ident, Path, PathSegment, Type,
4-
TypeParamBound,
3+
Error, GenericParam, Generics, Ident, Path, PathSegment, Type, TypeParamBound,
4+
punctuated::Punctuated,
55
};
66

77
use crate::{case::RenameRule, overrides::Overrides};

‎postgres-derive/src/enums.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl Variant {
1515
return Err(Error::new_spanned(
1616
raw,
1717
"non-C-like enums are not supported",
18-
))
18+
));
1919
}
2020
}
2121
let overrides = Overrides::extract(&raw.attrs, false)?;

‎postgres-derive/src/fromsql.rs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use proc_macro2::{Span, TokenStream};
22
use quote::{format_ident, quote};
33
use std::iter;
44
use syn::{
5-
punctuated::Punctuated, token, AngleBracketedGenericArguments, Data, DataStruct, DeriveInput,
6-
Error, Fields, GenericArgument, GenericParam, Generics, Ident, Lifetime, PathArguments,
7-
PathSegment,
5+
AngleBracketedGenericArguments, Data, DataStruct, DeriveInput, Error, Fields, GenericArgument,
6+
GenericParam, Generics, Ident, Lifetime, PathArguments, PathSegment, punctuated::Punctuated,
7+
token,
88
};
99
use syn::{LifetimeParam, TraitBound, TraitBoundModifier, TypeParamBound};
1010

@@ -45,7 +45,7 @@ pub fn expand_derive_fromsql(input: DeriveInput) -> Result<TokenStream, Error> {
4545
return Err(Error::new_spanned(
4646
input,
4747
"#[postgres(transparent)] may only be applied to single field tuple structs",
48-
))
48+
));
4949
}
5050
}
5151
} else if overrides.allow_mismatch {
@@ -70,48 +70,48 @@ pub fn expand_derive_fromsql(input: DeriveInput) -> Result<TokenStream, Error> {
7070
}
7171
} else {
7272
match input.data {
73-
Data::Enum(ref data) => {
74-
let variants = data
75-
.variants
76-
.iter()
77-
.map(|variant| Variant::parse(variant, overrides.rename_all))
78-
.collect::<Result<Vec<_>, _>>()?;
79-
(
80-
accepts::enum_body(&name, &variants, overrides.allow_mismatch),
81-
enum_body(&input.ident, &variants),
82-
)
83-
}
84-
Data::Struct(DataStruct {
85-
fields: Fields::Unnamed(ref fields),
86-
..
87-
}) if fields.unnamed.len() == 1 => {
88-
let field = fields.unnamed.first().unwrap();
89-
(
90-
domain_accepts_body(&name, field),
91-
domain_body(&input.ident, field),
92-
)
93-
}
94-
Data::Struct(DataStruct {
95-
fields: Fields::Named(ref fields),
96-
..
97-
}) => {
98-
let fields = fields
99-
.named
100-
.iter()
101-
.map(|field| Field::parse(field, overrides.rename_all))
102-
.collect::<Result<Vec<_>, _>>()?;
103-
(
104-
accepts::composite_body(&name, "FromSql", &fields),
105-
composite_body(&input.ident, &fields),
106-
)
107-
}
108-
_ => {
109-
return Err(Error::new_spanned(
110-
input,
111-
"#[derive(FromSql)] may only be applied to structs, single field tuple structs, and enums",
112-
))
73+
Data::Enum(ref data) => {
74+
let variants = data
75+
.variants
76+
.iter()
77+
.map(|variant| Variant::parse(variant, overrides.rename_all))
78+
.collect::<Result<Vec<_>, _>>()?;
79+
(
80+
accepts::enum_body(&name, &variants, overrides.allow_mismatch),
81+
enum_body(&input.ident, &variants),
82+
)
83+
}
84+
Data::Struct(DataStruct {
85+
fields: Fields::Unnamed(ref fields),
86+
..
87+
}) if fields.unnamed.len() == 1 => {
88+
let field = fields.unnamed.first().unwrap();
89+
(
90+
domain_accepts_body(&name, field),
91+
domain_body(&input.ident, field),
92+
)
93+
}
94+
Data::Struct(DataStruct {
95+
fields: Fields::Named(ref fields),
96+
..
97+
}) => {
98+
let fields = fields
99+
.named
100+
.iter()
101+
.map(|field| Field::parse(field, overrides.rename_all))
102+
.collect::<Result<Vec<_>, _>>()?;
103+
(
104+
accepts::composite_body(&name, "FromSql", &fields),
105+
composite_body(&input.ident, &fields),
106+
)
107+
}
108+
_ => {
109+
return Err(Error::new_spanned(
110+
input,
111+
"#[derive(FromSql)] may only be applied to structs, single field tuple structs, and enums",
112+
));
113+
}
113114
}
114-
}
115115
};
116116

117117
let ident = &input.ident;

‎postgres-derive/src/overrides.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use syn::{Attribute, Error, Expr, ExprLit, Lit, Meta, Token, punctuated::Punctuated};
1+
use syn::punctuated::Punctuated;
2+
use syn::{Attribute, Error, Expr, ExprLit, Lit, Meta, Token};
23

34
use crate::case::{RENAME_RULES, RenameRule};
45

‎postgres-native-tls/src/test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use tokio_postgres::tls::TlsConnect;
55

66
#[cfg(feature = "runtime")]
77
use crate::MakeTlsConnector;
8-
use crate::{set_postgresql_alpn, TlsConnector};
8+
use crate::{TlsConnector, set_postgresql_alpn};
99

1010
async fn smoke_test<T>(s: &str, tls: T)
1111
where

‎postgres-protocol/src/authentication/sasl.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! SASL-based authentication support.
22
3+
use base64::Engine;
34
use base64::display::Base64Display;
45
use base64::engine::general_purpose::STANDARD;
5-
use base64::Engine;
66
use hmac::{Hmac, Mac};
77
use rand::{self, RngExt};
88
use sha2::digest::FixedOutput;
@@ -452,11 +452,9 @@ mod test {
452452
let nonce = "9IZ2O01zb9IgiIZ1WJ/zgpJB";
453453

454454
let client_first = "n,,n=,r=9IZ2O01zb9IgiIZ1WJ/zgpJB";
455-
let server_first =
456-
"r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,s=fs3IXBy7U7+IvVjZ,i\
455+
let server_first = "r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,s=fs3IXBy7U7+IvVjZ,i\
457456
=4096";
458-
let client_final =
459-
"c=biws,r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,p=AmNKosjJzS3\
457+
let client_final = "c=biws,r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,p=AmNKosjJzS3\
460458
1NTlQYNs5BTeQjdHdk7lOflDo5re2an8=";
461459
let server_final = "v=U+ppxD5XUKtradnv8e2MkeupiA8FU87Sg8CXzXHDAzw=";
462460

‎postgres-protocol/src/message/frontend.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::error::Error;
77
use std::io;
88
use std::marker;
99

10-
use crate::{write_nullable, FromUsize, IsNull, Oid};
10+
use crate::{FromUsize, IsNull, Oid, write_nullable};
1111

1212
#[inline]
1313
fn write_body<F, E>(buf: &mut BytesMut, f: F) -> Result<(), E>

‎postgres-protocol/src/types/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::io::Read;
88
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
99
use std::str;
1010

11-
use crate::{write_nullable, FromUsize, IsNull, Lsn, Oid};
11+
use crate::{FromUsize, IsNull, Lsn, Oid, write_nullable};
1212

1313
#[cfg(test)]
1414
mod test;

‎postgres-types/src/jiff_01.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use bytes::BytesMut;
22
use jiff_01::{
3-
civil::{Date, DateTime, Time},
43
Span, SpanRound, Timestamp, Unit,
4+
civil::{Date, DateTime, Time},
55
};
66
use postgres_protocol::types;
77
use std::error::Error;

0 commit comments

Comments
 (0)