Skip to content

Commit 2ceb33c

Browse files
mdashtimdashti
committed
Revert "Fixed all clippy warnings."
This reverts commit d1f3b84.
1 parent 69fc1ca commit 2ceb33c

File tree

16 files changed

+286
-233
lines changed

16 files changed

+286
-233
lines changed

‎src/admin.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ where
283283
{
284284
let mut res = BytesMut::new();
285285

286-
let detail_msg = ["",
286+
let detail_msg = vec![
287+
"",
287288
"SHOW HELP|CONFIG|DATABASES|POOLS|CLIENTS|SERVERS|USERS|VERSION",
288289
// "SHOW PEERS|PEER_POOLS", // missing PEERS|PEER_POOLS
289290
// "SHOW FDS|SOCKETS|ACTIVE_SOCKETS|LISTS|MEM|STATE", // missing FDS|SOCKETS|ACTIVE_SOCKETS|MEM|STATE
@@ -299,7 +300,9 @@ where
299300
// "RECONNECT [<db>]", missing
300301
// "KILL <db>",
301302
// "SUSPEND",
302-
"SHUTDOWN"];
303+
"SHUTDOWN",
304+
// "WAIT_CLOSE [<db>]", // missing
305+
];
303306

304307
res.put(notify("Console usage", detail_msg.join("\n\t")));
305308
res.put(command_complete("SHOW"));
@@ -799,7 +802,7 @@ where
799802
T: tokio::io::AsyncWrite + std::marker::Unpin,
800803
{
801804
let parts: Vec<&str> = match tokens.len() == 2 {
802-
true => tokens[1].split(',').map(|part| part.trim()).collect(),
805+
true => tokens[1].split(",").map(|part| part.trim()).collect(),
803806
false => Vec::new(),
804807
};
805808

@@ -862,7 +865,7 @@ where
862865
T: tokio::io::AsyncWrite + std::marker::Unpin,
863866
{
864867
let parts: Vec<&str> = match tokens.len() == 2 {
865-
true => tokens[1].split(',').map(|part| part.trim()).collect(),
868+
true => tokens[1].split(",").map(|part| part.trim()).collect(),
866869
false => Vec::new(),
867870
};
868871

‎src/client.rs

Lines changed: 23 additions & 16 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.is_some() {
134+
if tls_certificate != None {
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,11 +982,15 @@ where
982982
}
983983

984984
// Check on plugin results.
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;
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+
_ => (),
990994
};
991995

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

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

12681272
trace!("Message: {}", code);
12691273

@@ -1321,7 +1325,7 @@ where
13211325
self.stats.transaction();
13221326
server
13231327
.stats()
1324-
.transaction(self.server_parameters.get_application_name());
1328+
.transaction(&self.server_parameters.get_application_name());
13251329

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

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

14391446
self.buffer.put(&message[..]);
14401447

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

14431450
// Almost certainly true
14441451
if first_message_code == 'P' && !prepared_statements_enabled {
@@ -1470,7 +1477,7 @@ where
14701477
self.stats.transaction();
14711478
server
14721479
.stats()
1473-
.transaction(self.server_parameters.get_application_name());
1480+
.transaction(&self.server_parameters.get_application_name());
14741481

14751482
// Release server back to the pool if we are in transaction mode.
14761483
// If we are in session mode, we keep the server until the client disconnects.
@@ -1732,7 +1739,7 @@ where
17321739
client_stats.query();
17331740
server.stats().query(
17341741
Instant::now().duration_since(query_start).as_millis() as u64,
1735-
self.server_parameters.get_application_name(),
1742+
&self.server_parameters.get_application_name(),
17361743
);
17371744

17381745
Ok(())

‎src/cmd_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub struct Args {
2525
}
2626

2727
pub fn parse() -> Args {
28-
Args::parse()
28+
return Args::parse();
2929
}
3030

3131
#[derive(ValueEnum, Clone, Debug)]

‎src/config.rs

Lines changed: 58 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,18 @@ impl Default for User {
236236

237237
impl User {
238238
fn validate(&self) -> Result<(), Error> {
239-
if let Some(min_pool_size) = self.min_pool_size {
240-
if min_pool_size > self.pool_size {
241-
error!(
242-
"min_pool_size of {} cannot be larger than pool_size of {}",
243-
min_pool_size, self.pool_size
244-
);
245-
return Err(Error::BadConfig);
239+
match self.min_pool_size {
240+
Some(min_pool_size) => {
241+
if min_pool_size > self.pool_size {
242+
error!(
243+
"min_pool_size of {} cannot be larger than pool_size of {}",
244+
min_pool_size, self.pool_size
245+
);
246+
return Err(Error::BadConfig);
247+
}
246248
}
249+
250+
None => (),
247251
};
248252

249253
Ok(())
@@ -673,9 +677,9 @@ impl Pool {
673677
Some(key) => {
674678
// No quotes in the key so we don't have to compare quoted
675679
// to unquoted idents.
676-
let key = key.replace('\"', "");
680+
let key = key.replace("\"", "");
677681

678-
if key.split('.').count() != 2 {
682+
if key.split(".").count() != 2 {
679683
error!(
680684
"automatic_sharding_key '{}' must be fully qualified, e.g. t.{}`",
681685
key, key
@@ -688,14 +692,17 @@ impl Pool {
688692
None => None,
689693
};
690694

691-
if let DefaultShard::Shard(shard_number) = self.default_shard {
692-
if shard_number >= self.shards.len() {
693-
error!("Invalid shard {:?}", shard_number);
694-
return Err(Error::BadConfig);
695+
match self.default_shard {
696+
DefaultShard::Shard(shard_number) => {
697+
if shard_number >= self.shards.len() {
698+
error!("Invalid shard {:?}", shard_number);
699+
return Err(Error::BadConfig);
700+
}
695701
}
702+
_ => (),
696703
}
697704

698-
for user in self.users.values() {
705+
for (_, user) in &self.users {
699706
user.validate()?;
700707
}
701708

@@ -770,8 +777,8 @@ impl<'de> serde::Deserialize<'de> for DefaultShard {
770777
D: Deserializer<'de>,
771778
{
772779
let s = String::deserialize(deserializer)?;
773-
if let Some(s) = s.strip_prefix("shard_") {
774-
let shard = s.parse::<usize>().map_err(serde::de::Error::custom)?;
780+
if s.starts_with("shard_") {
781+
let shard = s[6..].parse::<usize>().map_err(serde::de::Error::custom)?;
775782
return Ok(DefaultShard::Shard(shard));
776783
}
777784

@@ -867,7 +874,7 @@ pub trait Plugin {
867874
impl std::fmt::Display for Plugins {
868875
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
869876
fn is_enabled<T: Plugin>(arg: Option<&T>) -> bool {
870-
if let Some(arg) = arg {
877+
if let Some(ref arg) = arg {
871878
arg.is_enabled()
872879
} else {
873880
false
@@ -948,7 +955,6 @@ pub struct Query {
948955
}
949956

950957
impl Query {
951-
#[allow(clippy::needless_range_loop)]
952958
pub fn substitute(&mut self, db: &str, user: &str) {
953959
for col in self.result.iter_mut() {
954960
for i in 0..col.len() {
@@ -1073,8 +1079,8 @@ impl From<&Config> for std::collections::HashMap<String, String> {
10731079
(
10741080
format!("pools.{:?}.users", pool_name),
10751081
pool.users
1076-
.values()
1077-
.map(|user| &user.username)
1082+
.iter()
1083+
.map(|(_username, user)| &user.username)
10781084
.cloned()
10791085
.collect::<Vec<String>>()
10801086
.join(", "),
@@ -1159,9 +1165,13 @@ impl Config {
11591165
Some(tls_certificate) => {
11601166
info!("TLS certificate: {}", tls_certificate);
11611167

1162-
if let Some(tls_private_key) = self.general.tls_private_key.clone() {
1163-
info!("TLS private key: {}", tls_private_key);
1164-
info!("TLS support is enabled");
1168+
match self.general.tls_private_key.clone() {
1169+
Some(tls_private_key) => {
1170+
info!("TLS private key: {}", tls_private_key);
1171+
info!("TLS support is enabled");
1172+
}
1173+
1174+
None => (),
11651175
}
11661176
}
11671177

@@ -1196,8 +1206,8 @@ impl Config {
11961206
pool_name,
11971207
pool_config
11981208
.users
1199-
.values()
1200-
.map(|user_cfg| user_cfg.pool_size)
1209+
.iter()
1210+
.map(|(_, user_cfg)| user_cfg.pool_size)
12011211
.sum::<u32>()
12021212
.to_string()
12031213
);
@@ -1367,31 +1377,34 @@ impl Config {
13671377
}
13681378

13691379
// Validate TLS!
1370-
if let Some(tls_certificate) = self.general.tls_certificate.clone() {
1371-
match load_certs(Path::new(&tls_certificate)) {
1372-
Ok(_) => {
1373-
// Cert is okay, but what about the private key?
1374-
match self.general.tls_private_key.clone() {
1375-
Some(tls_private_key) => match load_keys(Path::new(&tls_private_key)) {
1376-
Ok(_) => (),
1377-
Err(err) => {
1378-
error!("tls_private_key is incorrectly configured: {:?}", err);
1380+
match self.general.tls_certificate.clone() {
1381+
Some(tls_certificate) => {
1382+
match load_certs(Path::new(&tls_certificate)) {
1383+
Ok(_) => {
1384+
// Cert is okay, but what about the private key?
1385+
match self.general.tls_private_key.clone() {
1386+
Some(tls_private_key) => match load_keys(Path::new(&tls_private_key)) {
1387+
Ok(_) => (),
1388+
Err(err) => {
1389+
error!("tls_private_key is incorrectly configured: {:?}", err);
1390+
return Err(Error::BadConfig);
1391+
}
1392+
},
1393+
1394+
None => {
1395+
error!("tls_certificate is set, but the tls_private_key is not");
13791396
return Err(Error::BadConfig);
13801397
}
1381-
},
1382-
1383-
None => {
1384-
error!("tls_certificate is set, but the tls_private_key is not");
1385-
return Err(Error::BadConfig);
1386-
}
1387-
};
1388-
}
1398+
};
1399+
}
13891400

1390-
Err(err) => {
1391-
error!("tls_certificate is incorrectly configured: {:?}", err);
1392-
return Err(Error::BadConfig);
1401+
Err(err) => {
1402+
error!("tls_certificate is incorrectly configured: {:?}", err);
1403+
return Err(Error::BadConfig);
1404+
}
13931405
}
13941406
}
1407+
None => (),
13951408
};
13961409

13971410
for pool in self.pools.values_mut() {

0 commit comments

Comments
 (0)