Resolve conflicts

Author: tautschnig

library/core/src/intrinsics/mod.rs

@@ -54,15 +54,11 @@
 )]
 #![allow(missing_docs)]
 
-<<<<<<< HEAD
 use safety::{ensures, requires};
 
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::{ConstParamTy, DiscriminantKind, Tuple};
-=======
 use crate::marker::{ConstParamTy, DiscriminantKind, PointeeSized, Tuple};
->>>>>>> subtree/library
 use crate::ptr;
 #[cfg(kani)]
 use crate::ub_checks;

library/core/src/ptr/mod.rs

@@ -398,13 +398,9 @@
 
 use crate::cmp::Ordering;
 use crate::intrinsics::const_eval_select;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::FnPtr;
-=======
 use crate::marker::{FnPtr, PointeeSized};
->>>>>>> subtree/library
 use crate::mem::{self, MaybeUninit, SizedTypeProperties};
 use crate::num::NonZero;
 use crate::{fmt, hash, intrinsics, ub_checks};

library/core/src/ptr/mut_ptr.rs

@@ -3,12 +3,9 @@ use safety::{ensures, requires};
 use super::*;
 use crate::cmp::Ordering::{Equal, Greater, Less};
 use crate::intrinsics::const_eval_select;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-=======
 use crate::marker::PointeeSized;
->>>>>>> subtree/library
 use crate::mem::{self, SizedTypeProperties};
 use crate::slice::{self, SliceIndex};
 

library/core/src/ptr/non_null.rs

@@ -1,13 +1,9 @@
 use safety::{ensures, requires};
 
 use crate::cmp::Ordering;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::Unsize;
-=======
 use crate::marker::{PointeeSized, Unsize};
->>>>>>> subtree/library
 use crate::mem::{MaybeUninit, SizedTypeProperties};
 use crate::num::NonZero;
 use crate::ops::{CoerceUnsized, DispatchFromDyn};

library/core/src/ptr/unique.rs

@@ -1,13 +1,9 @@
 use safety::{ensures, requires};
 
 use crate::fmt;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::{PhantomData, Unsize};
-=======
 use crate::marker::{PhantomData, PointeeSized, Unsize};
->>>>>>> subtree/library
 use crate::ops::{CoerceUnsized, DispatchFromDyn};
 use crate::pin::PinCoerceUnsized;
 use crate::ptr::NonNull;