Resolve conflicts

Author: tautschnig

library/alloc/src/lib.rs

@@ -85,11 +85,8 @@
 //
 // Library features:
 // tidy-alphabetical-start
-<<<<<<< HEAD
 #![cfg_attr(kani, feature(kani))]
-=======
 #![cfg_attr(not(no_global_oom_handling), feature(string_replace_in_place))]
->>>>>>> subtree/library
 #![feature(alloc_layout_extra)]
 #![feature(allocator_api)]
 #![feature(array_into_iter_constructors)]

library/core/Cargo.toml

@@ -42,13 +42,9 @@ check-cfg = [
     'cfg(target_has_reliable_f16_math)',
     'cfg(target_has_reliable_f128)',
     'cfg(target_has_reliable_f128_math)',
-<<<<<<< HEAD
+    'cfg(llvm_enzyme)',
     'cfg(kani)',
     'cfg(flux)'
-=======
-    'cfg(llvm_enzyme)',
-
->>>>>>> subtree/library
 ]
 
 [package.metadata.flux]

library/core/src/array/iter.rs

@@ -4,13 +4,9 @@ use safety::requires;
 
 use crate::intrinsics::transmute_unchecked;
 use crate::iter::{FusedIterator, TrustedLen, TrustedRandomAccessNoCoerce};
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::mem::MaybeUninit;
-=======
 use crate::mem::{ManuallyDrop, MaybeUninit};
->>>>>>> subtree/library
 use crate::num::NonZero;
 use crate::ops::{Deref as _, DerefMut as _, IndexRange, Range, Try};
 use crate::{fmt, ptr};

library/core/src/fmt/rt.rs

@@ -169,59 +169,3 @@ impl Argument<'_> {
         }
     }
 }
-<<<<<<< HEAD
-
-/// Used by the format_args!() macro to create a fmt::Arguments object.
-#[doc(hidden)]
-#[unstable(feature = "fmt_internals", issue = "none")]
-#[rustc_diagnostic_item = "FmtArgumentsNew"]
-impl<'a> Arguments<'a> {
-    #[inline]
-    pub const fn new_const<const N: usize>(pieces: &'a [&'static str; N]) -> Self {
-        const { assert!(N <= 1) };
-        Arguments { pieces, fmt: None, args: &[] }
-    }
-
-    /// When using the format_args!() macro, this function is used to generate the
-    /// Arguments structure.
-    ///
-    /// This function should _not_ be const, to make sure we don't accept
-    /// format_args!() and panic!() with arguments in const, even when not evaluated:
-    ///
-    /// ```compile_fail,E0015
-    /// const _: () = if false { panic!("a {}", "a") };
-    /// ```
-    #[inline]
-    pub fn new_v1<const P: usize, const A: usize>(
-        pieces: &'a [&'static str; P],
-        args: &'a [rt::Argument<'a>; A],
-    ) -> Arguments<'a> {
-        const { assert!(P >= A && P <= A + 1, "invalid args") }
-        Arguments { pieces, fmt: None, args }
-    }
-
-    /// Specifies nonstandard formatting parameters.
-    ///
-    /// SAFETY: the following invariants must be held:
-    /// 1. The `pieces` slice must be at least as long as `fmt`.
-    /// 2. Every `rt::Placeholder::position` value within `fmt` must be a valid index of `args`.
-    /// 3. Every `rt::Count::Param` within `fmt` must contain a valid index of `args`.
-    ///
-    /// This function should _not_ be const, to make sure we don't accept
-    /// format_args!() and panic!() with arguments in const, even when not evaluated:
-    ///
-    /// ```compile_fail,E0015
-    /// const _: () = if false { panic!("a {:1}", "a") };
-    /// ```
-    #[inline]
-    #[requires(pieces.len() >= fmt.len())]
-    pub unsafe fn new_v1_formatted(
-        pieces: &'a [&'static str],
-        args: &'a [rt::Argument<'a>],
-        fmt: &'a [rt::Placeholder],
-    ) -> Arguments<'a> {
-        Arguments { pieces, fmt: Some(fmt), args }
-    }
-}
-=======
->>>>>>> subtree/library

library/core/src/hint.rs

@@ -4,14 +4,11 @@
 //!
 //! Hints may be compile time or runtime.
 
-<<<<<<< HEAD
 use safety::requires;
 
 #[cfg(kani)]
 use crate::kani;
-=======
 use crate::marker::Destruct;
->>>>>>> subtree/library
 use crate::mem::MaybeUninit;
 use crate::{intrinsics, ub_checks};
 

library/core/src/intrinsics/mod.rs

@@ -57,17 +57,12 @@
 use safety::{ensures, requires};
 
 use crate::ffi::va_list::{VaArgSafe, VaListImpl};
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::{ConstParamTy, DiscriminantKind, PointeeSized, Tuple};
-use crate::ptr;
-#[cfg(kani)]
-use crate::ub_checks;
-=======
 use crate::marker::{ConstParamTy, Destruct, DiscriminantKind, PointeeSized, Tuple};
 use crate::{mem, ptr};
->>>>>>> subtree/library
+#[cfg(kani)]
+use crate::ub_checks;
 
 mod bounds;
 pub mod fallback;

library/core/src/mem/mod.rs

@@ -6,14 +6,10 @@
 #![stable(feature = "rust1", since = "1.0.0")]
 
 use crate::alloc::Layout;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::DiscriminantKind;
-=======
 use crate::clone::TrivialClone;
 use crate::marker::{Destruct, DiscriminantKind};
->>>>>>> subtree/library
 use crate::panic::const_assert;
 use crate::{clone, cmp, fmt, hash, intrinsics, ptr};
 

library/core/src/ops/index_range.rs

@@ -60,13 +60,9 @@ impl IndexRange {
     /// # Safety
     /// - Can only be called when `start < end`, aka when `len > 0`.
     #[inline]
-<<<<<<< HEAD
     #[requires(self.start < self.end)]
     #[cfg_attr(kani, kani::modifies(self))]
-    unsafe fn next_unchecked(&mut self) -> usize {
-=======
     const unsafe fn next_unchecked(&mut self) -> usize {
->>>>>>> subtree/library
         debug_assert!(self.start < self.end);
 
         let value = self.start;
@@ -78,13 +74,9 @@ impl IndexRange {
     /// # Safety
     /// - Can only be called when `start < end`, aka when `len > 0`.
     #[inline]
-<<<<<<< HEAD
     #[requires(self.start < self.end)]
     #[cfg_attr(kani, kani::modifies(self))]
-    unsafe fn next_back_unchecked(&mut self) -> usize {
-=======
     const unsafe fn next_back_unchecked(&mut self) -> usize {
->>>>>>> subtree/library
         debug_assert!(self.start < self.end);
 
         // SAFETY: The range isn't empty, so this cannot overflow

library/core/src/ptr/mod.rs

@@ -403,13 +403,9 @@
 
 use crate::cmp::Ordering;
 use crate::intrinsics::const_eval_select;
-<<<<<<< HEAD
 #[cfg(kani)]
 use crate::kani;
-use crate::marker::{FnPtr, PointeeSized};
-=======
 use crate::marker::{Destruct, 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,13 +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;
-=======
 use crate::marker::{Destruct, PointeeSized};
->>>>>>> subtree/library
 use crate::mem::{self, SizedTypeProperties};
 use crate::slice::{self, SliceIndex};