Skip to content

Commit 353c183

Browse files
Address a few 'cargo clippy' warnings
1 parent a610827 commit 353c183

File tree

4 files changed

+37
-35
lines changed

4 files changed

+37
-35
lines changed

src/blocking.rs

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::{
22
requests::{
33
ExchangeParams, QueueParams, RuntimeParameterDefinition, UserParams, VirtualHostParams,
4-
XArguments
4+
XArguments,
55
},
66
responses,
77
};
@@ -24,9 +24,9 @@ impl<'a> Client<'a> {
2424
password: Option<&'a str>,
2525
) -> Self {
2626
Self {
27-
endpoint: endpoint,
28-
username: username,
29-
password: password,
27+
endpoint,
28+
username,
29+
password,
3030
}
3131
}
3232

@@ -90,9 +90,8 @@ impl<'a> Client<'a> {
9090
pub fn list_bindings_in(
9191
&self,
9292
virtual_host: &str,
93-
) -> responses::Result<Vec<responses::BindingInfo>> {
94-
let response =
95-
self.http_get(&format!("bindings/{}", self.percent_encode(virtual_host)))?;
93+
) -> responses::Result<Vec<responses::BindingInfo>> {
94+
let response = self.http_get(&format!("bindings/{}", self.percent_encode(virtual_host)))?;
9695
response.json::<Vec<responses::BindingInfo>>()
9796
}
9897

@@ -126,8 +125,8 @@ impl<'a> Client<'a> {
126125
) -> responses::Result<responses::QueueInfo> {
127126
let response = self.http_get(&format!(
128127
"queues/{}/{}",
129-
self.percent_encode(&virtual_host),
130-
self.percent_encode(&name)
128+
self.percent_encode(virtual_host),
129+
self.percent_encode(name)
131130
))?;
132131
let queue = response.json::<responses::QueueInfo>()?;
133132
Ok(queue)
@@ -140,8 +139,8 @@ impl<'a> Client<'a> {
140139
) -> responses::Result<responses::ExchangeInfo> {
141140
let response = self.http_get(&format!(
142141
"exchanges/{}/{}",
143-
self.percent_encode(&virtual_host),
144-
self.percent_encode(&name)
142+
self.percent_encode(virtual_host),
143+
self.percent_encode(name)
145144
))?;
146145
let exchange = response.json::<responses::ExchangeInfo>()?;
147146
Ok(exchange)
@@ -153,15 +152,15 @@ impl<'a> Client<'a> {
153152

154153
pub fn update_vhost(&self, params: &VirtualHostParams) -> responses::Result<()> {
155154
let _ = self.http_put(
156-
&format!("vhosts/{}", self.percent_encode(&params.name)),
155+
&format!("vhosts/{}", self.percent_encode(params.name)),
157156
params,
158157
)?;
159158
Ok(())
160159
}
161160

162161
pub fn create_user(&self, params: &UserParams) -> responses::Result<()> {
163162
let _ = self.http_put(
164-
&format!("users/{}", self.percent_encode(&params.name)),
163+
&format!("users/{}", self.percent_encode(params.name)),
165164
params,
166165
)?;
167166
Ok(())
@@ -171,8 +170,8 @@ impl<'a> Client<'a> {
171170
let _ = self.http_put(
172171
&format!(
173172
"queues/{}/{}",
174-
self.percent_encode(&virtual_host),
175-
self.percent_encode(&params.name)
173+
self.percent_encode(virtual_host),
174+
self.percent_encode(params.name)
176175
),
177176
params,
178177
)?;
@@ -187,8 +186,8 @@ impl<'a> Client<'a> {
187186
let _ = self.http_put(
188187
&format!(
189188
"exchanges/{}/{}",
190-
self.percent_encode(&virtual_host),
191-
self.percent_encode(&params.name)
189+
self.percent_encode(virtual_host),
190+
self.percent_encode(params.name)
192191
),
193192
params,
194193
)?;
@@ -324,9 +323,9 @@ impl<'a> Client<'a> {
324323
) -> responses::Result<()> {
325324
let path = format!(
326325
"parameters/{}/{}/{}",
327-
self.percent_encode(&component),
328-
self.percent_encode(&vhost),
329-
self.percent_encode(&name)
326+
self.percent_encode(component),
327+
self.percent_encode(vhost),
328+
self.percent_encode(name)
330329
);
331330
self.http_delete(&path)?;
332331
Ok(())

src/password_hashing.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ pub fn salted_password_hash_sha256(salt: &Vec<u8>, password: &str) -> Vec<u8> {
1818
let digest = ctx.finish();
1919
let digest_vec = Vec::from(digest.as_ref());
2020

21-
let res = Vec::from([&salt[..], &digest_vec[..]].concat());
22-
23-
res
21+
[&salt[..], &digest_vec[..]].concat()
2422
}
2523

2624
pub fn base64_encoded_salted_password_hash_sha256(salt: &Vec<u8>, password: &str) -> String {

src/requests.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl<'a> QueueParams<'a> {
3939
pub fn new_quorum_queue(name: &'a str, optional_args: XArguments) -> Self {
4040
let args = Self::combined_args(optional_args, QueueType::Quorum);
4141
Self {
42-
name: name,
42+
name,
4343
queue_type: QueueType::Quorum,
4444
durable: true,
4545
auto_delete: false,
@@ -51,7 +51,7 @@ impl<'a> QueueParams<'a> {
5151
pub fn new_stream(name: &'a str, optional_args: XArguments) -> Self {
5252
let args = Self::combined_args(optional_args, QueueType::Stream);
5353
Self {
54-
name: name,
54+
name,
5555
queue_type: QueueType::Stream,
5656
durable: true,
5757
auto_delete: false,
@@ -63,7 +63,7 @@ impl<'a> QueueParams<'a> {
6363
pub fn new_durable_classic_queue(name: &'a str, optional_args: XArguments) -> Self {
6464
let args = Self::combined_args(optional_args, QueueType::Classic);
6565
Self {
66-
name: name,
66+
name,
6767
queue_type: QueueType::Classic,
6868
durable: true,
6969
auto_delete: false,
@@ -75,7 +75,7 @@ impl<'a> QueueParams<'a> {
7575
pub fn new_exclusive_classic_queue(name: &'a str, optional_args: XArguments) -> Self {
7676
let args = Self::combined_args(optional_args, QueueType::Classic);
7777
Self {
78-
name: name,
78+
name,
7979
queue_type: QueueType::Classic,
8080
durable: false,
8181
auto_delete: false,
@@ -88,9 +88,8 @@ impl<'a> QueueParams<'a> {
8888
let mut result = Map::<String, Value>::new();
8989
result.insert("x-queue-type".to_owned(), Value::String(queue_type.into()));
9090

91-
match optional_args {
92-
Some(mut val) => result.append(&mut val),
93-
None => (),
91+
if let Some(mut val) = optional_args {
92+
result.append(&mut val)
9493
}
9594

9695
Some(result)

tests/binding_tests.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,25 @@ fn test_list_bindings() {
1414

1515
let result1 = rc.declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None));
1616
assert!(result1.is_ok());
17-
17+
1818
let result2 = rc.bind_queue(vh_name, cq, fanout, None, None);
1919
assert!(result2.is_ok());
2020

2121
let result3 = rc.list_bindings();
2222
assert!(result3.is_ok());
2323
let vec = result3.unwrap();
24-
assert!(vec.iter().find(|vh| vh.destination == cq && vh.source == fanout).is_some());
25-
24+
assert!(vec
25+
.iter()
26+
.find(|vh| vh.destination == cq && vh.source == fanout)
27+
.is_some());
28+
2629
let result4 = rc.list_bindings_in(vh_name);
2730
assert!(result4.is_ok());
2831
let vec = result4.unwrap();
29-
assert!(vec.iter().find(|vh| vh.vhost == vh_name && vh.source == fanout).is_some());
30-
32+
assert!(vec
33+
.iter()
34+
.find(|vh| vh.vhost == vh_name && vh.source == fanout)
35+
.is_some());
36+
3137
let _ = rc.delete_queue(vh_name, cq);
3238
}

0 commit comments

Comments
 (0)