cmov: fix size int implementation of cmovnz (#1412)

Current `Cmov` implementation for `usize` and `isize` does nothing since
it mutates a temporary value.

This commit fixes this and add tests for `usize` and `isize`.

I am surprised that there is not a clippy lint that warns about this.

Co-authored-by: Nics <NicsTr@users.noreply.github.com>

Author: NicsTr

cmov/src/lib.rs

@@ -225,21 +225,27 @@ macro_rules! impl_cmov_traits_for_size_int {
             #[allow(clippy::cast_possible_truncation)]
             #[inline]
             fn cmovnz(&mut self, other: &Self, condition: Condition) {
-                (*self as $int16).cmovnz(&(*other as $int16), condition);
+                let mut tmp = *self as $int16;
+                tmp.cmovnz(&(*other as $int16), condition);
+                *self = tmp as $size;
             }
 
             #[cfg(target_pointer_width = "32")]
             #[allow(clippy::cast_possible_truncation)]
             #[inline]
             fn cmovnz(&mut self, other: &Self, condition: Condition) {
-                (*self as $int32).cmovnz(&(*other as $int32), condition);
+                let mut tmp = *self as $int32;
+                tmp.cmovnz(&(*other as $int32), condition);
+                *self = tmp as $size;
             }
 
             #[cfg(target_pointer_width = "64")]
             #[allow(clippy::cast_possible_truncation)]
             #[inline]
             fn cmovnz(&mut self, other: &Self, condition: Condition) {
-                (*self as $int64).cmovnz(&(*other as $int64), condition);
+                let mut tmp = *self as $int64;
+                tmp.cmovnz(&(*other as $int64), condition);
+                *self = tmp as $size;
             }
         }
 

cmov/src/macros.rs

@@ -57,6 +57,7 @@ mod tests {
         masknz_u16: u16,
         masknz_u32: u32,
         masknz_u64: u64,
-        masknz_u128: u128
+        masknz_u128: u128,
+        masknz_usize: usize
     );
 }

cmov/tests/core_impls.rs

@@ -114,6 +114,7 @@ int_tests!(
     0x1111_1111_1111_1111_1111_1111_1111_1111i128,
     -0x2222_2222_2222_2222_2222_2222_2222_2222i128
 );
+int_tests!(isize, 0x1111isize, -0x2222isize);
 int_tests!(u8, 0x11u8, 0x22u8);
 int_tests!(u16, 0x1111u16, 0x2222u16);
 int_tests!(u32, 0x1111_1111u32, 0x2222_2222u32);
@@ -123,6 +124,7 @@ int_tests!(
     0x1111_1111_1111_1111_2222_2222_2222_2222u128,
     0x2222_2222_2222_2222_3333_3333_3333_3333u128
 );
+int_tests!(usize, 0x1111usize, 0x2222usize);
 
 mod ordering {
     use cmov::{Cmov, CmovEq};

cmov/tests/proptests.rs

@@ -92,7 +92,9 @@ macro_rules! byte_array_proptests {
     };
 }
 
-int_proptests!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128);
+int_proptests!(
+    i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize
+);
 byte_array_proptests!(
     array0: 0,
     array1: 1,