Skip to content

Commit 9c6b143

Browse files
committed
client.rs clippy fixes.
1 parent 8b6e94a commit 9c6b143

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

src/client.rs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub async fn client_entrypoint(
131131
// Client requested a TLS connection.
132132
Ok((ClientConnectionType::Tls, _)) => {
133133
// TLS settings are configured, will setup TLS now.
134-
if tls_certificate != None {
134+
if tls_certificate.is_some() {
135135
debug!("Accepting TLS request");
136136

137137
let mut yes = BytesMut::new();
@@ -448,7 +448,7 @@ where
448448
None => "pgcat",
449449
};
450450

451-
let client_identifier = ClientIdentifier::new(&application_name, &username, &pool_name);
451+
let client_identifier = ClientIdentifier::new(application_name, username, pool_name);
452452

453453
let admin = ["pgcat", "pgbouncer"]
454454
.iter()
@@ -795,7 +795,7 @@ where
795795
let mut will_prepare = false;
796796

797797
let client_identifier = ClientIdentifier::new(
798-
&self.server_parameters.get_application_name(),
798+
self.server_parameters.get_application_name(),
799799
&self.username,
800800
&self.pool_name,
801801
);
@@ -982,15 +982,11 @@ where
982982
}
983983

984984
// Check on plugin results.
985-
match plugin_output {
986-
Some(PluginOutput::Deny(error)) => {
987-
self.buffer.clear();
988-
error_response(&mut self.write, &error).await?;
989-
plugin_output = None;
990-
continue;
991-
}
992-
993-
_ => (),
985+
if let Some(PluginOutput::Deny(error)) = plugin_output {
986+
self.buffer.clear();
987+
error_response(&mut self.write, &error).await?;
988+
plugin_output = None;
989+
continue;
994990
};
995991

996992
// Check if the pool is paused and wait until it's resumed.
@@ -1267,7 +1263,7 @@ where
12671263

12681264
// Safe to unwrap because we know this message has a certain length and has the code
12691265
// This reads the first byte without advancing the internal pointer and mutating the bytes
1270-
let code = *message.get(0).unwrap() as char;
1266+
let code = *message.first().unwrap() as char;
12711267

12721268
trace!("Message: {}", code);
12731269

@@ -1325,7 +1321,7 @@ where
13251321
self.stats.transaction();
13261322
server
13271323
.stats()
1328-
.transaction(&self.server_parameters.get_application_name());
1324+
.transaction(self.server_parameters.get_application_name());
13291325

13301326
// Release server back to the pool if we are in transaction mode.
13311327
// If we are in session mode, we keep the server until the client disconnects.
@@ -1400,13 +1396,10 @@ where
14001396
let close: Close = (&message).try_into()?;
14011397

14021398
if close.is_prepared_statement() && !close.anonymous() {
1403-
match self.prepared_statements.get(&close.name) {
1404-
Some(parse) => {
1405-
server.will_close(&parse.generated_name);
1406-
}
1407-
1399+
if let Some(parse) = self.prepared_statements.get(&close.name) {
1400+
server.will_close(&parse.generated_name);
1401+
} else {
14081402
// A prepared statement slipped through? Not impossible, since we don't support PREPARE yet.
1409-
None => (),
14101403
};
14111404
}
14121405
}
@@ -1445,7 +1438,7 @@ where
14451438

14461439
self.buffer.put(&message[..]);
14471440

1448-
let first_message_code = (*self.buffer.get(0).unwrap_or(&0)) as char;
1441+
let first_message_code = (*self.buffer.first().unwrap_or(&0)) as char;
14491442

14501443
// Almost certainly true
14511444
if first_message_code == 'P' && !prepared_statements_enabled {
@@ -1477,7 +1470,7 @@ where
14771470
self.stats.transaction();
14781471
server
14791472
.stats()
1480-
.transaction(&self.server_parameters.get_application_name());
1473+
.transaction(self.server_parameters.get_application_name());
14811474

14821475
// Release server back to the pool if we are in transaction mode.
14831476
// If we are in session mode, we keep the server until the client disconnects.
@@ -1739,7 +1732,7 @@ where
17391732
client_stats.query();
17401733
server.stats().query(
17411734
Instant::now().duration_since(query_start).as_millis() as u64,
1742-
&self.server_parameters.get_application_name(),
1735+
self.server_parameters.get_application_name(),
17431736
);
17441737

17451738
Ok(())

0 commit comments

Comments
 (0)