Skip to content

Commit 7293f8a

Browse files
authored
fix clippy error (#482)
Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
1 parent a9d37b7 commit 7293f8a

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

src/confchange/datadriven_test.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::fmt::Write;
2+
13
use crate::{default_logger, Changer, ProgressTracker};
24
use datadriven::{run_test, walk};
35
use itertools::Itertools;
@@ -58,16 +60,18 @@ fn test_conf_change_data_driven() -> anyhow::Result<()> {
5860
let mut buffer = String::new();
5961

6062
let conf = tr.conf();
61-
buffer.push_str(&format!("{}\n", conf));
63+
writeln!(buffer, "{}", conf).unwrap();
6264

6365
let prs = tr.progress();
6466

6567
// output with peer_id sorted
6668
for (k, v) in prs.iter().sorted_by(|&(k1, _), &(k2, _)| k1.cmp(k2)) {
67-
buffer.push_str(&format!(
69+
write!(
70+
buffer,
6871
"{}: {} match={} next={}",
6972
k, v.state, v.matched, v.next_idx
70-
));
73+
)
74+
.unwrap();
7175
if conf.learners.contains(k) {
7276
buffer.push_str(" learner");
7377
}

src/quorum/datadriven_test.rs

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::quorum::{AckIndexer, AckedIndexer, Index};
22
use crate::{default_logger, HashMap, HashSet, JointConfig, MajorityConfig};
33
use datadriven::{run_test, TestData};
4+
use std::fmt::Write;
45

56
fn test_quorum(data: &TestData) -> String {
67
// Two majority configs. The first one is always used (though it may
@@ -177,7 +178,7 @@ fn test_quorum(data: &TestData) -> String {
177178
let a_idx = JointConfig::new_joint_from_majorities(cj, c)
178179
.committed_index(use_group_commit, &l);
179180
if a_idx != idx {
180-
buf.push_str(&format!("{} <-- via symmetry\n", a_idx.0));
181+
writeln!(buf, "{} <-- via symmetry", a_idx.0).unwrap();
181182
}
182183
} else {
183184
idx = c.committed_index(use_group_commit, &l);
@@ -188,14 +189,14 @@ fn test_quorum(data: &TestData) -> String {
188189
JointConfig::new_joint_from_majorities(c.clone(), MajorityConfig::default())
189190
.committed_index(use_group_commit, &l);
190191
if a_idx != idx {
191-
buf.push_str(&format!("{} <-- via zero-joint quorum\n", a_idx.0));
192+
writeln!(buf, "{} <-- via zero-joint quorum", a_idx.0).unwrap();
192193
}
193194

194195
// Joining a majority with itself should give same result.
195196
let a_idx = JointConfig::new_joint_from_majorities(c.clone(), c.clone())
196197
.committed_index(use_group_commit, &l);
197198
if a_idx != idx {
198-
buf.push_str(&format!("{} <-- via self-joint quorum\n", a_idx.0));
199+
writeln!(buf, "{} <-- via self-joint quorum", a_idx.0).unwrap();
199200
}
200201

201202
// test overlaying
@@ -215,12 +216,14 @@ fn test_quorum(data: &TestData) -> String {
215216

216217
let a_idx = c.committed_index(use_group_commit, &l);
217218
if a_idx != idx {
218-
buf.push_str(&format!(
219-
"{} <-- overlaying {}->{}\n",
219+
writeln!(
220+
buf,
221+
"{} <-- overlaying {}->{}",
220222
a_idx.0,
221223
id,
222224
iidx.index - 1
223-
));
225+
)
226+
.unwrap();
224227
}
225228
// try 0
226229
l.insert(
@@ -233,24 +236,23 @@ fn test_quorum(data: &TestData) -> String {
233236

234237
let a_idx = c.committed_index(use_group_commit, &l);
235238
if a_idx != idx {
236-
buf.push_str(&format!(
237-
"{} <-- overlaying {}->{}\n",
238-
a_idx.0, id, 0
239-
));
239+
writeln!(buf, "{} <-- overlaying {}->{}", a_idx.0, id, 0).unwrap();
240240
}
241241
// recovery
242242
l.insert(id, iidx);
243243
}
244244
}
245245
}
246246
}
247-
buf.push_str(&format!(
248-
"{}\n",
247+
writeln!(
248+
buf,
249+
"{}",
249250
Index {
250251
index: idx.0,
251252
group_id: 0
252253
}
253-
));
254+
)
255+
.unwrap();
254256
}
255257
"group_committed" => {
256258
let use_group_commit = true;
@@ -268,18 +270,20 @@ fn test_quorum(data: &TestData) -> String {
268270
let a_idx = JointConfig::new_joint_from_majorities(cj, c)
269271
.committed_index(use_group_commit, &l);
270272
if a_idx != idx {
271-
buf.push_str(&format!("{} <-- via symmetry\n", a_idx.0));
273+
writeln!(buf, "{} <-- via symmetry", a_idx.0).unwrap();
272274
}
273275
} else {
274276
// TODO: majority group commit
275277
}
276-
buf.push_str(&format!(
277-
"{}\n",
278+
writeln!(
279+
buf,
280+
"{}",
278281
Index {
279282
index: idx.0,
280283
group_id: 0
281284
}
282-
));
285+
)
286+
.unwrap();
283287
}
284288
"vote" => {
285289
let ll = make_lookuper(&votes, &ids, &idsj);
@@ -297,12 +301,12 @@ fn test_quorum(data: &TestData) -> String {
297301
let ar = JointConfig::new_joint_from_majorities(cj, c)
298302
.vote_result(|id| l.get(&id).cloned());
299303
if ar != r {
300-
buf.push_str(&format!("{} <-- via symmetry\n", ar));
304+
writeln!(buf, "{} <-- via symmetry", ar).unwrap();
301305
}
302306
} else {
303307
r = c.vote_result(|id| l.get(&id).cloned());
304308
}
305-
buf.push_str(&format!("{}\n", r));
309+
writeln!(buf, "{}", r).unwrap();
306310
}
307311
_ => {
308312
panic!("unknown command: {}", data.cmd);

0 commit comments

Comments
 (0)