Revert "Upgrade toolchain to nightly-2025-03-07 (model-checking#3931)"

This reverts commit ad996ac.

Author: zhassan-aws

kani-compiler/src/kani_middle/stubbing/mod.rs

@@ -130,7 +130,7 @@ pub fn validate_stub_const(tcx: TyCtxt, instance: Instance) -> bool {
     let item = CrateItem::try_from(instance).unwrap();
     let internal_instance = rustc_internal::internal(tcx, instance);
     let mut checker = StubConstChecker::new(tcx, internal_instance, item);
-    checker.visit_body(&item.expect_body());
+    checker.visit_body(&item.body());
     checker.is_valid()
 }
 

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2025-03-07"
+channel = "nightly-2025-03-05"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

tests/kani/SizeAndAlignOfDst/unsized_tuple.rs

@@ -0,0 +1,18 @@
+// Copyright Kani Contributors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+//! Ensure we compute the size correctly including padding for unsized tuple.
+#![feature(unsized_tuple_coercion)]
+
+use std::fmt::Debug;
+
+#[kani::proof]
+fn check_adjusted_tup_size() {
+    let tup: (u32, [u8; 9]) = kani::any();
+    let size = std::mem::size_of_val(&tup);
+
+    let unsized_tup: *const (u32, dyn Debug) = &tup as *const _ as *const _;
+    let adjusted_size = std::mem::size_of_val(unsafe { &*unsized_tup });
+
+    assert_eq!(size, adjusted_size);
+}

tools/scanner/src/analysis.rs

@@ -138,7 +138,7 @@ impl OverallStats {
                 if !kind.is_fn() {
                     return None;
                 };
-                let unsafe_ops = FnUnsafeOperations::new(item.name()).collect(&item.expect_body());
+                let unsafe_ops = FnUnsafeOperations::new(item.name()).collect(&item.body());
                 let fn_sig = kind.fn_sig().unwrap();
                 let is_unsafe = fn_sig.skip_binder().safety == Safety::Unsafe;
                 self.fn_stats.get_mut(&item).unwrap().has_unsafe_ops =
@@ -167,7 +167,7 @@ impl OverallStats {
                 if !kind.is_fn() {
                     return None;
                 };
-                Some(FnLoops::new(item.name()).collect(&item.expect_body()))
+                Some(FnLoops::new(item.name()).collect(&item.body()))
             })
             .partition::<Vec<_>, _>(|props| props.has_loops());
 
@@ -179,7 +179,7 @@ impl OverallStats {
                 if !kind.is_fn() {
                     return None;
                 };
-                Some(FnLoops::new(item.name()).collect(&item.expect_body()))
+                Some(FnLoops::new(item.name()).collect(&item.body()))
             })
             .partition::<Vec<_>, _>(|props| props.has_iterators());
 
@@ -190,7 +190,7 @@ impl OverallStats {
                 if !kind.is_fn() {
                     return None;
                 };
-                let fn_props = FnLoops::new(item.name()).collect(&item.expect_body());
+                let fn_props = FnLoops::new(item.name()).collect(&item.body());
                 self.fn_stats.get_mut(&item).unwrap().has_loop_or_iterator =
                     Some(fn_props.has_iterators() || fn_props.has_loops());
                 Some(fn_props)
@@ -601,7 +601,7 @@ impl Recursion {
             .into_iter()
             .filter_map(|item| {
                 if let TyKind::RigidTy(RigidTy::FnDef(def, _)) = item.ty().kind() {
-                    let body = item.expect_body();
+                    let body = item.body();
                     let mut visitor = FnCallVisitor { body: &body, fns: vec![] };
                     visitor.visit_body(&body);
                     Some((def, visitor.fns))