Skip to content

Commit d23d01f

Browse files
committed
can't compile-error, fmt
1 parent b8bc4a7 commit d23d01f

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

firmware/defmt-rtt/src/channel.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ impl Channel {
139139
if *cursor + bytes.len() > BUF_SIZE {
140140
let pivot = BUF_SIZE - *cursor;
141141
ptr::copy_nonoverlapping(bytes.as_ptr(), self.buffer.add(*cursor), pivot);
142-
ptr::copy_nonoverlapping(bytes.as_ptr().add(pivot), self.buffer, bytes.len() - pivot);
142+
ptr::copy_nonoverlapping(
143+
bytes.as_ptr().add(pivot),
144+
self.buffer,
145+
bytes.len() - pivot,
146+
);
143147
} else {
144148
ptr::copy_nonoverlapping(bytes.as_ptr(), self.buffer.add(*cursor), bytes.len());
145149
}
@@ -188,7 +192,10 @@ pub(crate) fn available_buffer_size(read_cursor: usize, write_cursor: usize) ->
188192
mod tests {
189193
use super::{available_buffer_size, Channel};
190194
use crate::{consts::BUF_SIZE, MODE_NON_BLOCKING_TRIM};
191-
use core::{ptr, sync::atomic::{AtomicU32, Ordering}};
195+
use core::{
196+
ptr,
197+
sync::atomic::{AtomicU32, Ordering},
198+
};
192199

193200
#[test]
194201
fn test_rtt_available_buffer_size() {

firmware/defmt-rtt/src/lib.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@
5353
5454
#![no_std]
5555

56-
#[cfg(all(
57-
feature = "disable-irq-masking",
58-
not(test),
59-
any(not(target_arch = "arm"), not(target_os = "none"))
60-
))]
61-
compile_error!(
62-
"disable-irq-masking requires a bare-metal Arm target; it is only intended for single-thread-mode Cortex-M systems"
63-
);
64-
6556
mod channel;
6657
mod consts;
6758

@@ -376,7 +367,9 @@ impl AtomicRttEncoder {
376367
if *self.overflowed.get() {
377368
return;
378369
}
379-
if crate::channel::available_buffer_size(*self.start.get(), *self.cursor.get()) < bytes.len() {
370+
if crate::channel::available_buffer_size(*self.start.get(), *self.cursor.get())
371+
< bytes.len()
372+
{
380373
*self.overflowed.get() = true;
381374
return;
382375
}

0 commit comments

Comments
 (0)