rust/bits: Fix minor bugs in bits crate
cover rust/bits: Fix minor bugs in bits crate
These patches fix two minor bugs in bits crate
Nguyen Dinh Phi (2):
rust/bits: Align SubAssign behavior with Sub rust/bits: Use checked_ilog2() in Binary::format to avoid panic
rust/bits/src/lib.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/2 rust/bits: Align SubAssign behavior with Sub
Update SubAssign to perform a bit-clear operation instead of arithmetic subtraction, matching the behavior of Sub.
Signed-off-by Nguyen Dinh Phi <[email protected]>
--- rust/bits/src/lib.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
rust/bits/src/lib.rs +8 -1
@@ -320,7 +320,7 @@ fn sub(self, rhs: $struct_name) -> Self::Output {impl ::std::ops::SubAssign <$struct_name>for $struct_name {fn sub_assign (&mut self, rhs: $struct_name) { - self.0 = self.0 - rhs.0 + self.0 &= !rhs.0 } }
@@ -443,4 +443,11 @@ pub fn test_xor() {InterruptMask ::OE |InterruptMask ::PE |InterruptMask ::FE ); } + +#[test] +pub fn test_sub_assign () { +let mut op1 =InterruptMask ::E ; + op1 -=InterruptMask ::RI ; +assert_eq! (op1,InterruptMask ::E -InterruptMask ::RI ); + } }
Signature · 1 line
2.53.0
PATCH 2/2 rust/bits: Use checked_ilog2() in Binary::format to avoid panic
In reply to Nguyen Dinh Phiilog2() panics when VALID__ is 0 on empty bits. Switch to checked_ilog2() to handle zero safely.
Signed-off-by Nguyen Dinh Phi <[email protected]>
--- rust/bits/src/lib.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
rust/bits/src/lib.rs +14 -1
@@ -215,7 +215,9 @@ pub const fn invert(self) -> Self {impl ::std::fmt::Binary for $struct_name {fn fmt (&self, f: &mut ::std::fmt::Formatter <'_>) -> ::std::fmt::Result {// If no width, use the highest valid bit -let width = f.width ().unwrap_or ((Self ::VALID__ .ilog2 () +1 )as usize ); +let width = f + .width () + .unwrap_or (Self ::VALID__ .checked_ilog2 ().map_or (1 , |bit| (bit +1 )as usize ));write! (f,"{:0>width$.precision$b}" , self.0 , width = width, precision = f.precision ().unwrap_or (width))
@@ -412,6 +414,12 @@ pub struct InterruptMask(u32) { } } +bits! { +pub struct EmptyMask (u32 ) { +NONE =0 , + } + } +#[test] pub fn test_not () {assert_eq! (
@@ -450,4 +458,9 @@ pub fn test_sub_assign() { op1 -=InterruptMask ::RI ;assert_eq! (op1,InterruptMask ::E -InterruptMask ::RI ); } + +#[test] +pub fn test_bit_display_empty () { +assert_eq! (format! ("{:b}" ,EmptyMask ::NONE ),"0" ); + } }
Signature · 1 line
2.53.0
Paolo Bonzini
AppliedQueued, thanks.
Paolo