Skip to content

Commit 498a7a1

Browse files
Merge #251
251: Fix warnings r=therealprof a=thalesfragoso This was causing CI to fail when using `-D warnings`. Co-authored-by: Thales Fragoso <[email protected]>
2 parents 9021bcd + 256eb99 commit 498a7a1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/peripheral/icb.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! Implementation Control Block
22
3-
use volatile_register::{RO, RW};
3+
#[cfg(any(armv7m, armv8m, target_arch = "x86_64"))]
4+
use volatile_register::RO;
5+
use volatile_register::RW;
46

57
/// Register block
68
#[repr(C)]

src/register/fpscr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ impl Fpscr {
148148
pub fn set_rmode(&mut self, rmode: RMode) {
149149
let mask = 3 << 22;
150150
match rmode {
151-
RMode::Nearest => self.bits = self.bits & !mask,
151+
RMode::Nearest => self.bits &= !mask,
152152
RMode::PlusInfinity => self.bits = (self.bits & !mask) | (1 << 22),
153153
RMode::MinusInfinity => self.bits = (self.bits & !mask) | (2 << 22),
154-
RMode::Zero => self.bits = self.bits | mask,
154+
RMode::Zero => self.bits |= mask,
155155
}
156156
}
157157

0 commit comments

Comments
 (0)