Skip to content

Commit 9e89389

Browse files
yvtyvt
committed
Merge branch '🎨-format-string' into 🦆
2 parents 1e93844 + 2344f90 commit 9e89389

File tree

48 files changed

+188
-277
lines changed

Some content is hidden

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

48 files changed

+188
-277
lines changed

‎examples/basic/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<'_, SystemTraits>) -> Objects {
3939
}
4040

4141
fn task1_body() {
42-
log::trace!("COTTAGE = {:#?}", COTTAGE);
42+
log::trace!("COTTAGE = {COTTAGE:#?}");
4343
log::trace!("KENREL = {:#?}", System::debug());
4444

4545
COTTAGE.task2.activate().unwrap();

‎examples/basic_wio_terminal/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,10 +848,10 @@ fn panic(info: &PanicInfo) -> ! {
848848

849849
#[cortex_m_rt::exception]
850850
fn DefaultHandler(x: i16) -> ! {
851-
panic!("unhandled exception {}", x);
851+
panic!("unhandled exception {x}");
852852
}
853853

854854
#[cortex_m_rt::exception]
855855
fn HardFault(fr: &cortex_m_rt::ExceptionFrame) -> ! {
856-
panic!("hard fault: {:?}", fr);
856+
panic!("hard fault: {fr:?}");
857857
}

‎examples/common/build.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn main() {
4040
w!("pub static ANIMATION_FRAMES_565: &[fn() -> \
4141
ImageRaw<'static, Rgb565, LittleEndian>] = &[\n");
4242
for i in 0..frames.len() {
43-
w!(" animation_{}_565,\n", i);
43+
w!(" animation_{i}_565,\n");
4444
}
4545
w!("];\n");
4646

@@ -69,14 +69,8 @@ fn write_image(out: &mut impl Write, dir: &Path, name: &str, image: &RgbaImage)
6969
.collect::<Vec<u8>>(),
7070
)
7171
.unwrap();
72-
w!(
73-
"pub fn {}() -> ImageRaw<'static, Rgb565, LittleEndian> {{\n",
74-
name565
75-
);
76-
w!(
77-
" static IMAGE: &[u8] = include_bytes!(\"{}\");\n",
78-
name565
79-
);
72+
w!("pub fn {name565}() -> ImageRaw<'static, Rgb565, LittleEndian> {{\n");
73+
w!(" static IMAGE: &[u8] = include_bytes!(\"{name565}\");\n");
8074
w!(" ImageRaw::new(IMAGE, {})\n", image.width());
8175
w!("}}\n");
8276
}

‎src/r3_core/src/kernel/mutex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ define_object! {
6767
/// Err(LockMutexError::Abandoned) => {
6868
/// app.mutex.mark_consistent().unwrap();
6969
/// }
70-
/// Err(e) => panic!("failed to lock the mutex: {:?}", e),
70+
/// Err(e) => panic!("failed to lock the mutex: {e:?}"),
7171
/// }
7272
/// app.mutex.unlock().unwrap();
7373
/// }

‎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
}

‎src/r3_kernel/src/utils/ctz.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ mod tests {
298298

299299
assert_eq!(
300300
expected, got,
301-
"func({}) = {}, expected = {}",
302-
in_value, got, expected,
301+
"func({in_value}) = {got}, expected = {expected}",
303302
);
304303
}
305304

@@ -323,8 +322,7 @@ mod tests {
323322

324323
assert_eq!(
325324
expected, got,
326-
"func({}) = {}, expected = {}",
327-
in_value, got, expected,
325+
"func({in_value}) = {got}, expected = {expected}",
328326
);
329327
}
330328
}

‎src/r3_kernel/src/utils/int.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ mod tests {
280280

281281
let got_set_bits: Vec<u32> = i.one_digits().collect();
282282

283-
log::trace!("i = 0x{:x}", i);
284-
log::trace!(" got = {:?}", got_set_bits);
285-
log::trace!(" expected = {:?}", set_bits);
283+
log::trace!("i = {i:#x}");
284+
log::trace!(" got = {got_set_bits:?}");
285+
log::trace!(" expected = {set_bits:?}");
286286

287287
got_set_bits == set_bits
288288
}

‎src/r3_kernel/src/utils/prio_bitmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@ mod tests {
280280
let mut subject = T::INIT;
281281
let mut reference = BTreePrioBitmap::new();
282282

283-
log::info!("size = {}", size);
283+
log::info!("size = {size}");
284284

285285
for cmd in interpret(&bytecode, size) {
286-
log::trace!(" {:?}", cmd);
286+
log::trace!(" {cmd:?}");
287287
match cmd {
288288
Cmd::Insert(bit) => {
289289
subject.set(bit);

‎src/r3_port_riscv/src/threading/imp/instemu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ unsafe fn panic_on_unhandled_exception(fl_state: *mut usize, mcause: usize) -> !
168168
// Read the original PC from the first-level state
169169
let pc = unsafe { *fl_state.offset(16) };
170170

171-
panic!("unhandled exception {} at 0x{:08x}", mcause, pc);
171+
panic!("unhandled exception {mcause} at {pc:#08x}");
172172
}
173173

174174
#[cfg(not(feature = "emulate-lr-sc"))]

0 commit comments

Comments
 (0)