put kani imports back

Author: carolynzech

library/core/src/alloc/layout.rs

@@ -4,10 +4,14 @@
 // collections, resulting in having to optimize down excess IR multiple times.
 // Your performance intuition is useless. Run perf.
 
+use safety::requires;
 use crate::error::Error;
 use crate::ptr::{Alignment, NonNull};
 use crate::{cmp, fmt, mem};
 
+#[cfg(kani)]
+use crate::kani;
+
 // While this function is used in one place and its implementation
 // could be inlined, the previous attempts to do so made rustc
 // slower:

library/core/src/char/methods.rs

@@ -6,6 +6,9 @@ use crate::str::from_utf8_unchecked_mut;
 use crate::unicode::printable::is_printable;
 use crate::unicode::{self, conversions};
 
+#[cfg(kani)]
+use crate::kani;
+
 impl char {
     /// The lowest valid code point a `char` can have, `'\0'`.
     ///

library/core/src/intrinsics.rs

@@ -63,9 +63,13 @@
 )]
 #![allow(missing_docs)]
 
+use safety::requires;
 use crate::marker::{DiscriminantKind, Tuple};
 use crate::{ptr, ub_checks};
 
+#[cfg(kani)]
+use crate::kani;
+
 pub mod mir;
 pub mod simd;
 

library/core/src/mem/mod.rs

@@ -8,6 +8,9 @@
 use crate::marker::DiscriminantKind;
 use crate::{clone, cmp, fmt, hash, intrinsics, ptr};
 
+#[cfg(kani)]
+use crate::kani;
+
 mod manually_drop;
 #[stable(feature = "manually_drop", since = "1.20.0")]
 pub use manually_drop::ManuallyDrop;

library/core/src/ptr/mod.rs

@@ -413,6 +413,9 @@ use crate::marker::FnPtr;
 use crate::mem::{self, MaybeUninit};
 use crate::{fmt, hash, intrinsics, ub_checks};
 
+#[cfg(kani)]
+use crate::kani;
+
 mod alignment;
 #[unstable(feature = "ptr_alignment_type", issue = "102070")]
 pub use alignment::Alignment;