Skip to content

Commit 17116af

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #51 from michaelklishin/clippy-fix-for-rust-1.88
Clippy fixes for Rust 1.88
2 parents 58a8b02 + 4b4bd04 commit 17116af

Some content is hidden

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

42 files changed

+209
-323
lines changed

‎src/commons.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl From<&SupportedProtocol> for String {
232232
impl fmt::Display for SupportedProtocol {
233233
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
234234
let proto: String = self.into();
235-
write!(f, "{}", proto)
235+
write!(f, "{proto}")
236236
}
237237
}
238238

@@ -360,7 +360,7 @@ impl Display for QueueType {
360360
QueueType::Quorum => write!(f, "quorum"),
361361
QueueType::Stream => write!(f, "stream"),
362362
QueueType::Delayed => write!(f, "delayed"),
363-
QueueType::Unsupported(s) => write!(f, "{}", s),
363+
QueueType::Unsupported(s) => write!(f, "{s}"),
364364
}
365365
}
366366
}

‎src/formatting.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl Display for TagMap {
9898
impl Display for DeprecatedFeatureList {
9999
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
100100
for df in &self.0 {
101-
writeln!(f, "{}", df)?;
101+
writeln!(f, "{df}")?;
102102
}
103103

104104
Ok(())
@@ -142,7 +142,7 @@ impl Display for FeatureFlag {
142142
impl Display for FeatureFlagList {
143143
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
144144
for ff in &self.0 {
145-
writeln!(f, "{}", ff)?;
145+
writeln!(f, "{ff}")?;
146146
}
147147

148148
Ok(())
@@ -152,7 +152,7 @@ impl Display for FeatureFlagList {
152152
impl Display for MessageList {
153153
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
154154
for msg in &self.0 {
155-
writeln!(f, "{}", msg)?;
155+
writeln!(f, "{msg}")?;
156156
}
157157

158158
Ok(())
@@ -230,9 +230,9 @@ pub fn fmt_list_as_json_array(f: &mut fmt::Formatter<'_>, xs: &[String]) -> fmt:
230230
let mut xs = xs.to_owned();
231231
let last_element = xs.pop().unwrap();
232232
for elem in xs {
233-
write!(f, "{}, ", elem)?;
233+
write!(f, "{elem}, ")?;
234234
}
235-
write!(f, "{}", last_element)?;
235+
write!(f, "{last_element}")?;
236236
write!(f, "]")?;
237237
Ok(())
238238
}
@@ -248,9 +248,9 @@ pub fn fmt_comma_separated_list(f: &mut fmt::Formatter<'_>, xs: &[String]) -> fm
248248
let mut xs = xs.to_owned();
249249
let last_element = xs.pop().unwrap();
250250
for elem in xs {
251-
write!(f, "{}, ", elem)?;
251+
write!(f, "{elem}, ")?;
252252
}
253-
write!(f, "{}", last_element)?;
253+
write!(f, "{last_element}")?;
254254
Ok(())
255255
}
256256
}
@@ -265,9 +265,9 @@ pub fn fmt_vertical_list_with_bullets(f: &mut fmt::Formatter<'_>, xs: &[String])
265265
let mut xs = xs.to_owned();
266266
let last_element = xs.pop().unwrap();
267267
for elem in xs {
268-
writeln!(f, "* {}", elem)?;
268+
writeln!(f, "* {elem}")?;
269269
}
270-
write!(f, "* {}", last_element)?;
270+
write!(f, "* {last_element}")?;
271271
Ok(())
272272
}
273273
}
@@ -282,9 +282,9 @@ pub fn fmt_vertical_list_without_bullets(f: &mut fmt::Formatter<'_>, xs: &[Strin
282282
let mut xs = xs.to_owned();
283283
let last_element = xs.pop().unwrap();
284284
for elem in xs {
285-
writeln!(f, "{}", elem)?;
285+
writeln!(f, "{elem}")?;
286286
}
287-
write!(f, "{}", last_element)?;
287+
write!(f, "{last_element}")?;
288288
Ok(())
289289
}
290290
}
@@ -295,7 +295,7 @@ pub fn fmt_map_as_colon_separated_pairs(
295295
xs: &Map<String, serde_json::Value>,
296296
) -> fmt::Result {
297297
for (k, v) in xs.iter() {
298-
writeln!(f, "{}: {}", k, v)?;
298+
writeln!(f, "{k}: {v}")?;
299299
}
300300

301301
Ok(())
@@ -307,7 +307,7 @@ where
307307
{
308308
match opt {
309309
None => "".to_owned(),
310-
Some(val) => format!("{}", val).to_owned(),
310+
Some(val) => format!("{val}").to_owned(),
311311
}
312312
}
313313

@@ -321,7 +321,7 @@ pub fn display_option_details_rate(opt: &Option<Rate>) -> String {
321321
pub fn display_arg_table(xs: &XArguments) -> String {
322322
let mut s = String::new();
323323
for (k, v) in xs.0.iter() {
324-
let line = format!("{}: {}\n", k, v);
324+
let line = format!("{k}: {v}\n");
325325
s += line.as_str()
326326
}
327327

@@ -334,7 +334,7 @@ pub fn display_tag_map_option(opt: &Option<TagMap>) -> String {
334334
let mut s = String::new();
335335
let iter = val.0.clone().into_iter();
336336
for (k, v) in iter {
337-
let line = format!("\"{}\": {}\n", k, v);
337+
let line = format!("\"{k}\": {v}\n");
338338
s += line.as_str()
339339
}
340340

@@ -350,7 +350,7 @@ pub fn display_tag_list_option(opt: &Option<TagList>) -> String {
350350
let mut s = String::new();
351351
let iter = val.0.clone().into_iter();
352352
for t in iter {
353-
let line = format!("{}\n", t);
353+
let line = format!("{t}\n");
354354
s += line.as_str()
355355
}
356356

‎src/responses.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl fmt::Display for NodeMemoryBreakdown {
391391
];
392392

393393
for (k, v) in data {
394-
writeln!(f, "{}: {}", k, v)?;
394+
writeln!(f, "{k}: {v}")?;
395395
}
396396

397397
Ok(())
@@ -2440,8 +2440,8 @@ impl fmt::Display for WarmStandbyReplicationLinkStateOnDownstream {
24402440
impl fmt::Display for WarmStandbyReplicationState {
24412441
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
24422442
match self {
2443-
WarmStandbyReplicationState::Upstream(val) => write!(f, "{}", val),
2444-
WarmStandbyReplicationState::Downstream(val) => write!(f, "{}", val),
2443+
WarmStandbyReplicationState::Upstream(val) => write!(f, "{val}"),
2444+
WarmStandbyReplicationState::Downstream(val) => write!(f, "{val}"),
24452445
WarmStandbyReplicationState::Unknown => write!(f, "(unknown)"),
24462446
}
24472447
}

‎src/transformers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl DefinitionSetTransformer for ObfuscateUsernames {
7979
let mut obfuscated = HashMap::<String, String>::new();
8080
let mut i = 1u16;
8181
for u in &defs.users {
82-
let new_name = format!("obfuscated-user-{}", i);
82+
let new_name = format!("obfuscated-user-{i}");
8383
i += 1;
8484
obfuscated.insert(u.name.clone(), new_name.clone());
8585
}
@@ -88,7 +88,7 @@ impl DefinitionSetTransformer for ObfuscateUsernames {
8888
let updated_users = defs.users.clone().into_iter().map(|u| {
8989
let new_name = obfuscated.get(&u.name).unwrap_or(&u.name).as_str();
9090
let salt = password_hashing::salt();
91-
let new_password = format!("password-{}", i);
91+
let new_password = format!("password-{i}");
9292
let hash =
9393
password_hashing::base64_encoded_salted_password_hash_sha256(&salt, &new_password);
9494

‎src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn percentage(a: u64, b: u64) -> f64 {
1818

1919
pub fn percentage_as_text(a: u64, b: u64) -> String {
2020
let p = percentage(a, b);
21-
format!("{:.2}%", p)
21+
format!("{p:.2}%")
2222
}
2323

2424
#[macro_export]

‎tests/async_binding_tests.rs

Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ async fn test_async_list_all_bindings() {
3232
let result1 = rc
3333
.declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
3434
.await;
35-
assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
35+
assert!(result1.is_ok(), "declare_queue returned {result1:?}");
3636

3737
let result2 = rc.bind_queue(vh_name, cq, fanout, None, None).await;
38-
assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
38+
assert!(result2.is_ok(), "bind_queue returned {result2:?}");
3939

4040
let result3 = rc.list_bindings().await;
41-
assert!(result3.is_ok(), "list_bindings returned {:?}", result3);
41+
assert!(result3.is_ok(), "list_bindings returned {result3:?}");
4242
let vec = result3.unwrap();
4343
assert!(vec
4444
.iter()
4545
.any(|b| b.destination == cq && b.source == fanout));
4646

4747
let result4 = rc.list_bindings_in(vh_name).await;
48-
assert!(result4.is_ok(), "list_bindings_in returned {:?}", result4);
48+
assert!(result4.is_ok(), "list_bindings_in returned {result4:?}");
4949
let vec = result4.unwrap();
5050
assert!(vec
5151
.iter()
@@ -66,17 +66,13 @@ async fn test_async_list_only_queue_bindings() {
6666
let result1 = rc
6767
.declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
6868
.await;
69-
assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
69+
assert!(result1.is_ok(), "declare_queue returned {result1:?}");
7070

7171
let result2 = rc.bind_queue(vh_name, cq, fanout, None, None).await;
72-
assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
72+
assert!(result2.is_ok(), "bind_queue returned {result2:?}");
7373

7474
let result3 = rc.list_queue_bindings(vh_name, cq).await;
75-
assert!(
76-
result3.is_ok(),
77-
"list_queue_bindings returned {:?}",
78-
result3
79-
);
75+
assert!(result3.is_ok(), "list_queue_bindings returned {result3:?}");
8076
let vec = result3.unwrap();
8177
assert!(vec
8278
.iter()
@@ -104,28 +100,27 @@ async fn test_async_list_only_exchange_bindings() {
104100
&ExchangeParams::fanout(fanout2, false, false, None),
105101
)
106102
.await;
107-
assert!(result1.is_ok(), "declare_exchange returned {:?}", result1);
103+
assert!(result1.is_ok(), "declare_exchange returned {result1:?}");
108104

109105
let result2 = rc
110106
.bind_exchange(vh_name, fanout1, fanout2, None, None)
111107
.await;
112-
assert!(result2.is_ok(), "bind_exchange returned {:?}", result2);
108+
assert!(result2.is_ok(), "bind_exchange returned {result2:?}");
113109

114110
let result3 = rc
115111
.declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
116112
.await;
117-
assert!(result3.is_ok(), "declare_queue returned {:?}", result3);
113+
assert!(result3.is_ok(), "declare_queue returned {result3:?}");
118114

119115
let result4 = rc.bind_queue(vh_name, cq, fanout1, None, None).await;
120-
assert!(result4.is_ok(), "bind_queue returned {:?}", result4);
116+
assert!(result4.is_ok(), "bind_queue returned {result4:?}");
121117

122118
let result5 = rc
123119
.list_exchange_bindings_with_source(vh_name, fanout2)
124120
.await;
125121
assert!(
126122
result5.is_ok(),
127-
"list_exchange_bindings_with_source returned {:?}",
128-
result5
123+
"list_exchange_bindings_with_source returned {result5:?}"
129124
);
130125
let vec = result5.unwrap();
131126
assert!(!vec
@@ -143,8 +138,7 @@ async fn test_async_list_only_exchange_bindings() {
143138
.await;
144139
assert!(
145140
result6.is_ok(),
146-
"list_exchange_bindings_with_destination returned {:?}",
147-
result6
141+
"list_exchange_bindings_with_destination returned {result6:?}"
148142
);
149143
let vec = result6.unwrap();
150144
assert!(!vec
@@ -173,17 +167,13 @@ async fn test_async_delete_queue_bindings() {
173167
let result1 = rc
174168
.declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
175169
.await;
176-
assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
170+
assert!(result1.is_ok(), "declare_queue returned {result1:?}");
177171

178172
let result2 = rc.bind_queue(vh_name, cq, fanout, Some("foo"), None).await;
179-
assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
173+
assert!(result2.is_ok(), "bind_queue returned {result2:?}");
180174

181175
let result3 = rc.list_queue_bindings(vh_name, cq).await;
182-
assert!(
183-
result3.is_ok(),
184-
"list_queue_bindings returned {:?}",
185-
result3
186-
);
176+
assert!(result3.is_ok(), "list_queue_bindings returned {result3:?}");
187177
let vec = result3.unwrap();
188178
assert!(vec
189179
.iter()
@@ -203,14 +193,10 @@ async fn test_async_delete_queue_bindings() {
203193
Some(m),
204194
)
205195
.await;
206-
assert!(result4.is_ok(), "delete_binding returned {:?}", result4);
196+
assert!(result4.is_ok(), "delete_binding returned {result4:?}");
207197

208198
let result5 = rc.list_queue_bindings(vh_name, cq).await;
209-
assert!(
210-
result5.is_ok(),
211-
"list_queue_bindings returned {:?}",
212-
result5
213-
);
199+
assert!(result5.is_ok(), "list_queue_bindings returned {result5:?}");
214200
let vec = result5.unwrap();
215201
assert!(!vec
216202
.iter()
@@ -234,15 +220,14 @@ async fn test_async_delete_exchange_bindings() {
234220
let result2 = rc
235221
.bind_exchange(vh_name, direct, fanout, Some("foo"), None)
236222
.await;
237-
assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
223+
assert!(result2.is_ok(), "bind_queue returned {result2:?}");
238224

239225
let result3 = rc
240226
.list_exchange_bindings_with_destination(vh_name, direct)
241227
.await;
242228
assert!(
243229
result3.is_ok(),
244-
"list_exchange_bindings_with_destination returned {:?}",
245-
result3
230+
"list_exchange_bindings_with_destination returned {result3:?}"
246231
);
247232
let vec = result3.unwrap();
248233
assert!(vec
@@ -263,15 +248,14 @@ async fn test_async_delete_exchange_bindings() {
263248
Some(m),
264249
)
265250
.await;
266-
assert!(result4.is_ok(), "delete_binding returned {:?}", result4);
251+
assert!(result4.is_ok(), "delete_binding returned {result4:?}");
267252

268253
let result5 = rc
269254
.list_exchange_bindings_with_destination(vh_name, direct)
270255
.await;
271256
assert!(
272257
result5.is_ok(),
273-
"list_exchange_bindings_with_destination returned {:?}",
274-
result5
258+
"list_exchange_bindings_with_destination returned {result5:?}"
275259
);
276260
let vec = result5.unwrap();
277261
assert!(!vec

‎tests/async_channel_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async fn test_list_channels() {
3030
assert!(ch.is_open());
3131

3232
let result1 = rc.list_channels().await;
33-
assert!(result1.is_ok(), "list_channels returned {:?}", result1);
33+
assert!(result1.is_ok(), "list_channels returned {result1:?}");
3434

3535
// just to be explicit
3636
ch.close().await.unwrap();
@@ -51,7 +51,7 @@ async fn test_list_virtual_host_channels() {
5151

5252
let vh_name = "/";
5353
let result1 = rc.list_channels_in(vh_name).await;
54-
assert!(result1.is_ok(), "list_channels_in returned {:?}", result1);
54+
assert!(result1.is_ok(), "list_channels_in returned {result1:?}");
5555

5656
// just to be explicit
5757
ch.close().await.unwrap();

0 commit comments

Comments
 (0)