Merge branch 'main' into add-kmir-tool

Author: jberthold

library/core/src/num/nonzero.rs

@@ -755,7 +755,7 @@ macro_rules! nonzero_integer {
             #[must_use = "this returns the result of the operation, \
                         without modifying the original"]
             #[inline(always)]
-            #[ensures(|result| result.get() > 0)]
+            #[ensures(|result| result.get() != 0)]
             #[ensures(|result| result.rotate_right(n).get() == old(self).get())]
             pub const fn rotate_left(self, n: u32) -> Self {
                 let result = self.get().rotate_left(n);
@@ -790,7 +790,7 @@ macro_rules! nonzero_integer {
             #[must_use = "this returns the result of the operation, \
                         without modifying the original"]
             #[inline(always)]
-            #[ensures(|result| result.get() > 0)]
+            #[ensures(|result| result.get() != 0)]
             #[ensures(|result| result.rotate_left(n).get() == old(self).get())]
             pub const fn rotate_right(self, n: u32) -> Self {
                 let result = self.get().rotate_right(n);

library/core/src/ptr/const_ptr.rs

@@ -2614,7 +2614,7 @@ mod verify {
     gen_const_byte_arith_harness_for_dyn!(byte_sub, check_const_byte_sub_dyn);
     gen_const_byte_arith_harness_for_dyn!(byte_offset, check_const_byte_offset_dyn);
 
-    // Proof for contact of byte_offset_from to verify unit type
+    // Proof for contract of byte_offset_from to verify unit type
     #[kani::proof_for_contract(<*const ()>::byte_offset_from)]
     pub fn check_const_byte_offset_from_unit() {
         let val: () = ();

scripts/kani-std-analysis/metrics-data-core.json

@@ -270,6 +270,28 @@
       "verified_safe_fns_under_contract": 111,
       "verified_safe_fns_with_loop_under_contract": 0,
       "total_functions_under_contract_all_crates": 313
+    },
+    {
+      "date": "2025-05-11",
+      "total_unsafe_fns": 7249,
+      "total_unsafe_fns_with_loop": 16,
+      "total_safe_abstractions": 1805,
+      "total_safe_abstractions_with_loop": 74,
+      "total_safe_fns": 15737,
+      "total_safe_fns_with_loop": 744,
+      "unsafe_fns_under_contract": 194,
+      "unsafe_fns_with_loop_under_contract": 2,
+      "verified_unsafe_fns_under_contract": 184,
+      "verified_unsafe_fns_with_loop_under_contract": 1,
+      "safe_abstractions_under_contract": 77,
+      "safe_abstractions_with_loop_under_contract": 0,
+      "verified_safe_abstractions_under_contract": 77,
+      "verified_safe_abstractions_with_loop_under_contract": 0,
+      "safe_fns_under_contract": 113,
+      "safe_fns_with_loop_under_contract": 0,
+      "verified_safe_fns_under_contract": 111,
+      "verified_safe_fns_with_loop_under_contract": 0,
+      "total_functions_under_contract_all_crates": 313
     }
   ]
 }

scripts/kani-std-analysis/metrics-data-std.json

@@ -153,6 +153,28 @@
       "verified_safe_fns_under_contract": 0,
       "verified_safe_fns_with_loop_under_contract": 0,
       "total_functions_under_contract_all_crates": 313
+    },
+    {
+      "date": "2025-05-11",
+      "total_unsafe_fns": 179,
+      "total_unsafe_fns_with_loop": 12,
+      "total_safe_abstractions": 509,
+      "total_safe_abstractions_with_loop": 44,
+      "total_safe_fns": 4096,
+      "total_safe_fns_with_loop": 176,
+      "unsafe_fns_under_contract": 0,
+      "unsafe_fns_with_loop_under_contract": 0,
+      "verified_unsafe_fns_under_contract": 0,
+      "verified_unsafe_fns_with_loop_under_contract": 0,
+      "safe_abstractions_under_contract": 0,
+      "safe_abstractions_with_loop_under_contract": 0,
+      "verified_safe_abstractions_under_contract": 0,
+      "verified_safe_abstractions_with_loop_under_contract": 0,
+      "safe_fns_under_contract": 0,
+      "safe_fns_with_loop_under_contract": 0,
+      "verified_safe_fns_under_contract": 0,
+      "verified_safe_fns_with_loop_under_contract": 0,
+      "total_functions_under_contract_all_crates": 313
     }
   ]
 }