Skip to content

Commit 3ff26ba

Browse files
paolobarbolinipaolobarbolini
committed
style: fix latest clippy warnings
1 parent e1cd6be commit 3ff26ba

File tree

28 files changed

+58
-68
lines changed

28 files changed

+58
-68
lines changed

‎codegen/src/sqlstate.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ fn make_code(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<Fi
7272
file,
7373
r#"
7474
Inner::E{code} => "{code}","#,
75-
code = code,
7675
)
7776
.unwrap();
7877
}
@@ -97,8 +96,6 @@ fn make_consts(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<
9796
/// {code}
9897
pub const {name}: SqlState = SqlState(Inner::E{code});
9998
"#,
100-
name = name,
101-
code = code,
10299
)
103100
.unwrap();
104101
}
@@ -121,8 +118,7 @@ enum Inner {{"#,
121118
write!(
122119
file,
123120
r#"
124-
E{},"#,
125-
code,
121+
E{code},"#,
126122
)
127123
.unwrap();
128124
}

‎codegen/src/type_gen.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,18 +237,18 @@ fn parse_types() -> BTreeMap<u32, Type> {
237237
let doc_name = array_re.replace(&name, "$1[]").to_ascii_uppercase();
238238
let mut doc = doc_name.clone();
239239
if let Some(descr) = raw_type.get("descr") {
240-
write!(doc, " - {}", descr).unwrap();
240+
write!(doc, " - {descr}").unwrap();
241241
}
242242
let doc = Escape::new(doc.as_bytes().iter().cloned()).collect();
243243
let doc = String::from_utf8(doc).unwrap();
244244

245245
if let Some(array_type_oid) = raw_type.get("array_type_oid") {
246246
let array_type_oid = array_type_oid.parse::<u32>().unwrap();
247247

248-
let name = format!("_{}", name);
249-
let variant = format!("{}Array", variant);
250-
let doc = format!("{}&#91;&#93;", doc_name);
251-
let ident = format!("{}_ARRAY", ident);
248+
let name = format!("_{name}");
249+
let variant = format!("{variant}Array");
250+
let doc = format!("{doc_name}&#91;&#93;");
251+
let ident = format!("{ident}_ARRAY");
252252

253253
let type_ = Type {
254254
name,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ where
2121
let result = conn.query_one(&stmt, &[]).unwrap().get(0);
2222
assert_eq!(val, &result);
2323

24-
let stmt = conn.prepare(&format!("SELECT $1::{}", sql_type)).unwrap();
24+
let stmt = conn.prepare(&format!("SELECT $1::{sql_type}")).unwrap();
2525
let result = conn.query_one(&stmt, &[val]).unwrap().get(0);
2626
assert_eq!(val, &result);
2727
}
@@ -45,7 +45,7 @@ pub fn test_type_asymmetric<T, F, S, C>(
4545
let result: F = conn.query_one(&stmt, &[]).unwrap().get(0);
4646
assert!(cmp(val, &result));
4747

48-
let stmt = conn.prepare(&format!("SELECT $1::{}", sql_type)).unwrap();
48+
let stmt = conn.prepare(&format!("SELECT $1::{sql_type}")).unwrap();
4949
let result: F = conn.query_one(&stmt, &[val]).unwrap().get(0);
5050
assert!(cmp(val, &result));
5151
}

‎postgres-derive/src/overrides.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl Overrides {
6565
"invalid rename_all rule, expected one of: {}",
6666
RENAME_RULES
6767
.iter()
68-
.map(|rule| format!("\"{}\"", rule))
68+
.map(|rule| format!("\"{rule}\""))
6969
.collect::<Vec<_>>()
7070
.join(", ")
7171
),

‎postgres-derive/src/tosql.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ fn composite_body(fields: &[Field]) -> TokenStream {
196196
postgres_types::IsNull::Yes => -1,
197197
postgres_types::IsNull::No => {
198198
let len = buf.len() - base - 4;
199-
if len > i32::max_value() as usize {
199+
if len > i32::MAX as usize {
200200
return std::result::Result::Err(
201201
std::convert::Into::into("value too large to transmit"));
202202
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn md5_hash(username: &[u8], password: &[u8], salt: [u8; 4]) -> String {
1414
md5.update(password);
1515
md5.update(username);
1616
let output = md5.finalize_reset();
17-
md5.update(format!("{:x}", output));
17+
md5.update(format!("{output:x}"));
1818
md5.update(salt);
1919
format!("md5{:x}", md5.finalize())
2020
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl ScramSha256 {
262262

263263
let verifier = match parsed {
264264
ServerFinalMessage::Error(e) => {
265-
return Err(io::Error::other(format!("SCRAM error: {}", e)));
265+
return Err(io::Error::other(format!("SCRAM error: {e}")));
266266
}
267267
ServerFinalMessage::Verifier(verifier) => verifier,
268268
};
@@ -302,10 +302,8 @@ impl<'a> Parser<'a> {
302302
match self.it.next() {
303303
Some((_, c)) if c == target => Ok(()),
304304
Some((i, c)) => {
305-
let m = format!(
306-
"unexpected character at byte {}: expected `{}` but got `{}",
307-
i, target, c
308-
);
305+
let m =
306+
format!("unexpected character at byte {i}: expected `{target}` but got `{c}");
309307
Err(io::Error::new(io::ErrorKind::InvalidInput, m))
310308
}
311309
None => Err(io::Error::new(
@@ -371,7 +369,7 @@ impl<'a> Parser<'a> {
371369
match self.it.peek() {
372370
Some(&(i, _)) => Err(io::Error::new(
373371
io::ErrorKind::InvalidInput,
374-
format!("unexpected trailing data at byte {}", i),
372+
format!("unexpected trailing data at byte {i}"),
375373
)),
376374
None => Ok(()),
377375
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl Message {
235235
tag => {
236236
return Err(io::Error::new(
237237
io::ErrorKind::InvalidInput,
238-
format!("unknown authentication tag `{}`", tag),
238+
format!("unknown authentication tag `{tag}`"),
239239
));
240240
}
241241
},
@@ -262,7 +262,7 @@ impl Message {
262262
tag => {
263263
return Err(io::Error::new(
264264
io::ErrorKind::InvalidInput,
265-
format!("unknown message tag `{}`", tag),
265+
format!("unknown message tag `{tag}`"),
266266
));
267267
}
268268
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,5 @@ pub fn md5(password: &[u8], username: &str) -> String {
102102
let mut hash = Md5::new();
103103
hash.update(&salted_password);
104104
let digest = hash.finalize();
105-
format!("md5{:x}", digest)
105+
format!("md5{digest:x}")
106106
}

‎postgres-types/src/chrono_04.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl<'a> FromSql<'a> for NaiveDate {
123123
impl ToSql for NaiveDate {
124124
fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
125125
let jd = self.signed_duration_since(base().date()).num_days();
126-
if jd > i64::from(i32::max_value()) || jd < i64::from(i32::min_value()) {
126+
if jd > i64::from(i32::MAX) || jd < i64::from(i32::MIN) {
127127
return Err("value too large to transmit".into());
128128
}
129129

‎postgres-types/src/lib.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl fmt::Display for Type {
319319
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
320320
match self.schema() {
321321
"public" | "pg_catalog" => {}
322-
schema => write!(fmt, "{}.", schema)?,
322+
schema => write!(fmt, "{schema}.")?,
323323
}
324324
fmt.write_str(self.name())
325325
}
@@ -631,16 +631,14 @@ impl<'a, T: FromSql<'a>, const N: usize> FromSql<'a> for [T; N] {
631631
let v = values
632632
.next()?
633633
.ok_or_else(|| -> Box<dyn Error + Sync + Send> {
634-
format!("too few elements in array (expected {}, got {})", N, i).into()
634+
format!("too few elements in array (expected {N}, got {i})").into()
635635
})?;
636636
T::from_sql_nullable(member_type, v)
637637
})?;
638638
if values.next()?.is_some() {
639-
return Err(format!(
640-
"excess elements in array (expected {}, got more than that)",
641-
N,
642-
)
643-
.into());
639+
return Err(
640+
format!("excess elements in array (expected {N}, got more than that)",).into(),
641+
);
644642
}
645643

646644
Ok(out)

‎postgres-types/src/pg_lsn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl fmt::Display for PgLsn {
5252

5353
impl fmt::Debug for PgLsn {
5454
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
55-
f.write_fmt(format_args!("{}", self))
55+
f.write_fmt(format_args!("{self}"))
5656
}
5757
}
5858

‎postgres-types/src/time_02.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'a> FromSql<'a> for Date {
7272
impl ToSql for Date {
7373
fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
7474
let jd = (*self - base().date()).whole_days();
75-
if jd > i64::from(i32::max_value()) || jd < i64::from(i32::min_value()) {
75+
if jd > i64::from(i32::MAX) || jd < i64::from(i32::MIN) {
7676
return Err("value too large to transmit".into());
7777
}
7878

‎postgres-types/src/time_03.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'a> FromSql<'a> for Date {
7676
impl ToSql for Date {
7777
fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
7878
let jd = (*self - base().date()).whole_days();
79-
if jd > i64::from(i32::max_value()) || jd < i64::from(i32::min_value()) {
79+
if jd > i64::from(i32::MAX) || jd < i64::from(i32::MIN) {
8080
return Err("value too large to transmit".into());
8181
}
8282

‎tokio-postgres/src/config.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,10 +872,8 @@ impl<'a> Parser<'a> {
872872
match self.it.next() {
873873
Some((_, c)) if c == target => Ok(()),
874874
Some((i, c)) => {
875-
let m = format!(
876-
"unexpected character at byte {}: expected `{}` but got `{}`",
877-
i, target, c
878-
);
875+
let m =
876+
format!("unexpected character at byte {i}: expected `{target}` but got `{c}`");
879877
Err(Error::config_parse(m.into()))
880878
}
881879
None => Err(Error::config_parse("unexpected EOF".into())),

‎tokio-postgres/src/connect_socket.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) async fn connect_socket(
4545
}
4646
#[cfg(unix)]
4747
Addr::Unix(dir) => {
48-
let path = dir.join(format!(".s.PGSQL.{}", port));
48+
let path = dir.join(format!(".s.PGSQL.{port}"));
4949
let socket = connect_with_timeout(UnixStream::connect(path), connect_timeout).await?;
5050
Ok(Socket::new_unix(socket))
5151
}

‎tokio-postgres/src/error/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ impl fmt::Display for DbError {
312312
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
313313
write!(fmt, "{}: {}", self.severity, self.message)?;
314314
if let Some(detail) = &self.detail {
315-
write!(fmt, "\nDETAIL: {}", detail)?;
315+
write!(fmt, "\nDETAIL: {detail}")?;
316316
}
317317
if let Some(hint) = &self.hint {
318-
write!(fmt, "\nHINT: {}", hint)?;
318+
write!(fmt, "\nHINT: {hint}")?;
319319
}
320320
Ok(())
321321
}
@@ -382,9 +382,9 @@ impl fmt::Display for Error {
382382
Kind::Io => fmt.write_str("error communicating with the server")?,
383383
Kind::UnexpectedMessage => fmt.write_str("unexpected message from server")?,
384384
Kind::Tls => fmt.write_str("error performing TLS handshake")?,
385-
Kind::ToSql(idx) => write!(fmt, "error serializing parameter {}", idx)?,
386-
Kind::FromSql(idx) => write!(fmt, "error deserializing column {}", idx)?,
387-
Kind::Column(column) => write!(fmt, "invalid column `{}`", column)?,
385+
Kind::ToSql(idx) => write!(fmt, "error serializing parameter {idx}")?,
386+
Kind::FromSql(idx) => write!(fmt, "error deserializing column {idx}")?,
387+
Kind::Column(column) => write!(fmt, "invalid column `{column}`")?,
388388
Kind::Parameters(real, expected) => {
389389
write!(fmt, "expected {expected} parameters but got {real}")?
390390
}
@@ -401,7 +401,7 @@ impl fmt::Display for Error {
401401
Kind::Timeout => fmt.write_str("timeout waiting for server")?,
402402
};
403403
if let Some(ref cause) = self.0.cause {
404-
write!(fmt, ": {}", cause)?;
404+
write!(fmt, ": {cause}")?;
405405
}
406406
Ok(())
407407
}

‎tokio-postgres/src/prepare.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ fn prepare_rec<'a>(
118118

119119
fn encode(client: &InnerClient, name: &str, query: &str, types: &[Type]) -> Result<Bytes, Error> {
120120
if types.is_empty() {
121-
debug!("preparing query {}: {}", name, query);
121+
debug!("preparing query {name}: {query}");
122122
} else {
123-
debug!("preparing query {} with types {:?}: {}", name, types, query);
123+
debug!("preparing query {name} with types {types:?}: {query}");
124124
}
125125

126126
client.with_buf(|buf| {

‎tokio-postgres/src/simple_query.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl SimpleColumn {
3333
}
3434

3535
pub async fn simple_query(client: &InnerClient, query: &str) -> Result<SimpleQueryStream, Error> {
36-
debug!("executing simple query: {}", query);
36+
debug!("executing simple query: {query}");
3737

3838
let buf = encode(client, query)?;
3939
let responses = client.send(RequestMessages::Single(FrontendMessage::Raw(buf)))?;
@@ -46,7 +46,7 @@ pub async fn simple_query(client: &InnerClient, query: &str) -> Result<SimpleQue
4646
}
4747

4848
pub async fn batch_execute(client: &InnerClient, query: &str) -> Result<(), Error> {
49-
debug!("executing statement batch: {}", query);
49+
debug!("executing statement batch: {query}");
5050

5151
let buf = encode(client, query)?;
5252
let mut responses = client.send(RequestMessages::Single(FrontendMessage::Raw(buf)))?;

‎tokio-postgres/src/transaction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ impl<'a> Transaction<'a> {
314314

315315
async fn _savepoint(&mut self, name: Option<String>) -> Result<Transaction<'_>, Error> {
316316
let depth = self.savepoint.as_ref().map_or(0, |sp| sp.depth) + 1;
317-
let name = name.unwrap_or_else(|| format!("sp_{}", depth));
318-
let query = format!("SAVEPOINT {}", name);
317+
let name = name.unwrap_or_else(|| format!("sp_{depth}"));
318+
let query = format!("SAVEPOINT {name}");
319319
self.batch_execute(&query).await?;
320320

321321
Ok(Transaction {

‎tokio-postgres/tests/test/binary_copy.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async fn write_many_rows() {
5656
for i in 0..10_000i32 {
5757
writer
5858
.as_mut()
59-
.write(&[&i, &format!("the value for {}", i)])
59+
.write(&[&i, &format!("the value for {i}")])
6060
.await
6161
.unwrap();
6262
}
@@ -69,7 +69,7 @@ async fn write_many_rows() {
6969
.unwrap();
7070
for (i, row) in rows.iter().enumerate() {
7171
assert_eq!(row.get::<_, i32>(0), i as i32);
72-
assert_eq!(row.get::<_, &str>(1), format!("the value for {}", i));
72+
assert_eq!(row.get::<_, &str>(1), format!("the value for {i}"));
7373
}
7474
}
7575

@@ -164,7 +164,7 @@ async fn read_many_rows() {
164164

165165
for (i, row) in rows.iter().enumerate() {
166166
assert_eq!(row.get::<i32>(0), i as i32);
167-
assert_eq!(row.get::<&str>(1), format!("the value for {}", i));
167+
assert_eq!(row.get::<&str>(1), format!("the value for {i}"));
168168
}
169169
}
170170

‎tokio-postgres/tests/test/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,11 +624,11 @@ async fn copy_in_large() {
624624
let a = Bytes::from_static(b"0\tname0\n");
625625
let mut b = BytesMut::new();
626626
for i in 1..5_000 {
627-
writeln!(b, "{0}\tname{0}", i).unwrap();
627+
writeln!(b, "{i}\tname{i}").unwrap();
628628
}
629629
let mut c = BytesMut::new();
630630
for i in 5_000..10_000 {
631-
writeln!(c, "{0}\tname{0}", i).unwrap();
631+
writeln!(c, "{i}\tname{i}").unwrap();
632632
}
633633
let mut stream = stream::iter(
634634
vec![a, b.freeze(), c.freeze()]
@@ -704,7 +704,7 @@ async fn copy_out() {
704704
async fn notices() {
705705
let long_name = "x".repeat(65);
706706
let (client, mut connection) =
707-
connect_raw(&format!("user=postgres application_name={}", long_name,))
707+
connect_raw(&format!("user=postgres application_name={long_name}",))
708708
.await
709709
.unwrap();
710710

‎tokio-postgres/tests/test/parse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::time::Duration;
22
use tokio_postgres::config::{Config, SslNegotiation, TargetSessionAttrs};
33

44
fn check(s: &str, config: &Config) {
5-
assert_eq!(s.parse::<Config>().expect(s), *config, "`{}`", s);
5+
assert_eq!(s.parse::<Config>().expect(s), *config, "`{s}`");
66
}
77

88
#[test]

‎tokio-postgres/tests/test/types/chrono_04.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async fn test_special_params_without_wrapper() {
166166
T: FromSqlOwned + fmt::Debug,
167167
{
168168
let err = client
169-
.query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
169+
.query_one(&*format!("SELECT {val}::{sql_type}"), &[])
170170
.await
171171
.unwrap()
172172
.try_get::<_, T>(0)

0 commit comments

Comments
 (0)