Skip to content

Commit 3d2e385

Browse files
committed
test(core,kernel): inline format args
Some instances were not caught by `clippy::uninlined_format_args` because this lint only recognizes a small predefined set of formatting macros at the moment.
1 parent 1e93844 commit 3d2e385

File tree

2 files changed

+18
-28
lines changed

2 files changed

+18
-28
lines changed

src/r3_core/src/utils/binary_heap/tests.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,28 @@ fn test_inner<T: BinaryHeap + Default + super::VecLike<Element = usize> + std::f
4646
let mut subject = T::default();
4747
let mut reference = Vec::new();
4848

49-
log::debug!("max_len = {}, bytecode len = {}", max_len, bytecode.len());
49+
log::debug!("max_len = {max_len}, bytecode len = {}", bytecode.len());
5050

5151
for cmd in interpret(&bytecode, max_len) {
52-
log::trace!(" {:?}", cmd);
52+
log::trace!(" {cmd:?}");
5353
match cmd {
5454
Cmd::Insert(value) => {
5555
let i = subject.heap_push(value, Ctx);
56-
log::trace!(" → {}", i);
56+
log::trace!(" → {i}");
5757

5858
let i = reference.binary_search(&value).unwrap_or_else(|x| x);
5959
reference.insert(i, value);
6060
}
6161
Cmd::Remove(i) => {
6262
let out_subject = subject.heap_remove(i, Ctx).unwrap();
63-
log::trace!(" → {}", out_subject);
63+
log::trace!(" → {out_subject}");
6464

6565
let i_ref = reference.binary_search(&out_subject).unwrap();
6666
reference.remove(i_ref);
6767
}
6868
}
69-
log::trace!("[sorted: {:?}]", reference);
70-
log::trace!("[subject: {:?}]", subject);
69+
log::trace!("[sorted: {reference:?}]");
70+
log::trace!("[subject: {subject:?}]");
7171
if subject.len() > 0 {
7272
assert_eq!(subject[0], reference[0]);
7373
}
@@ -120,7 +120,7 @@ impl BinaryHeapCtx<El> for TrackingCtx<'_> {
120120

121121
fn on_move(&mut self, e: &mut El, new_index: usize) {
122122
self.el_position[e.id] = Some(new_index);
123-
log::trace!(" on_move{:?}", (e, new_index));
123+
log::trace!(" on_move({e:?}, {new_index})");
124124
}
125125
}
126126

@@ -135,29 +135,29 @@ fn position_tracking(bytecode: Vec<u8>) {
135135
log::debug!("bytecode len = {}", bytecode.len());
136136

137137
for cmd in interpret(&bytecode, usize::MAX) {
138-
log::trace!(" {:?}", cmd);
138+
log::trace!(" {cmd:?}");
139139
match cmd {
140140
Cmd::Insert(value) => {
141141
let id = el_position.len();
142142
el_position.push(None);
143143
let i = subject.heap_push(El { value, id }, TrackingCtx { el_position });
144-
log::trace!(" → {}", i);
144+
log::trace!(" → {i}");
145145

146146
// `on_move` should have reported the position for the
147147
// newly-inserted element
148148
assert_eq!(el_position[id], Some(i));
149149
}
150150
Cmd::Remove(i) => {
151151
let out_subject = subject.heap_remove(i, TrackingCtx { el_position }).unwrap();
152-
log::trace!(" → {:?}", out_subject);
152+
log::trace!(" → {out_subject:?}");
153153

154154
// For a removed element, we must modify `el_position` manually
155155
el_position[out_subject.id] = None;
156156
}
157157
}
158158

159-
log::trace!("[subject: {:?}]", subject);
160-
log::trace!("[el_position: {:?}]", el_position);
159+
log::trace!("[subject: {subject:?}]");
160+
log::trace!("[el_position: {el_position:?}]");
161161

162162
// Check if `el_position` correctly represents
163163
// the current state of `subject`

src/r3_core/src/utils/binary_search.rs

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mod tests {
4545
fn lower_bound(mut values: Vec<u32>, arbitrary_value: u32) {
4646
values.sort();
4747

48-
log::debug!("values = {:?}", values);
48+
log::debug!("values = {values:?}");
4949

5050
for (i, &e) in values.iter().enumerate() {
5151
let mut expected = i;
@@ -54,12 +54,7 @@ mod tests {
5454
}
5555

5656
let got = lower_bound!(values.len(), |i| values[i] < e);
57-
log::debug!(
58-
" lower_bound(values[{}]) = {} (expected {})",
59-
i,
60-
got,
61-
expected
62-
);
57+
log::debug!(" lower_bound(values[{i}]) = {got} (expected {expected})");
6358

6459
assert_eq!(got, expected);
6560
}
@@ -70,29 +65,24 @@ mod tests {
7065
}
7166
let mid = win[0] + (win[1] - win[0]) / 2;
7267
let got = lower_bound!(values.len(), |i| values[i] < mid);
73-
log::debug!(
74-
" lower_bound(mean(values[{}] + values[{} + 1])) = {}",
75-
i,
76-
i,
77-
got
78-
);
68+
log::debug!(" lower_bound(mean(values[{i}] + values[{i} + 1])) = {got}");
7969
assert_eq!(got, i + 1);
8070
}
8171

8272
if values.is_empty() {
8373
let got = lower_bound!(values.len(), |i| values[i] < arbitrary_value);
84-
log::debug!(" lower_bound({}) = {}", arbitrary_value, got);
74+
log::debug!(" lower_bound({arbitrary_value}) = {got}");
8575
assert_eq!(got, 0);
8676
} else {
8777
if *values.first().unwrap() > 0 {
8878
#[allow(unused_comparisons)]
8979
let got = lower_bound!(values.len(), |i| values[i] < 0);
90-
log::debug!(" lower_bound(0) = {}", got);
80+
log::debug!(" lower_bound(0) = {got}");
9181
assert_eq!(got, 0);
9282
}
9383
if *values.last().unwrap() < u32::MAX {
9484
let got = lower_bound!(values.len(), |i| values[i] < u32::MAX);
95-
log::debug!(" lower_bound({}) = {}", u32::MAX, got);
85+
log::debug!(" lower_bound({}) = {got}", u32::MAX);
9686
assert_eq!(got, values.len());
9787
}
9888
}

0 commit comments

Comments
 (0)