From a2dd4a3b5be7356c7c72387346e4299093964ea6 Mon Sep 17 00:00:00 2001
From: Caleb Zulawski <caleb.zulawski@gmail.com>
Date: Sat, 17 Feb 2024 10:49:13 -0500
Subject: [PATCH 1/3] Minor fixes

---
 crates/core_simd/src/lib.rs   | 1 -
 crates/core_simd/src/masks.rs | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
index 4cad148f224c..a25723e11cef 100644
--- a/crates/core_simd/src/lib.rs
+++ b/crates/core_simd/src/lib.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![feature(
-    core_intrinsics,
     const_intrinsic_copy,
     const_refs_to_cell,
     const_maybe_uninit_as_mut_ptr,
diff --git a/crates/core_simd/src/masks.rs b/crates/core_simd/src/masks.rs
index 4389079adb37..ad7c68fc7f6f 100644
--- a/crates/core_simd/src/masks.rs
+++ b/crates/core_simd/src/masks.rs
@@ -33,7 +33,7 @@ mod sealed {
 
         fn eq(self, other: Self) -> bool;
 
-        fn as_usize(self) -> usize;
+        fn to_usize(self) -> usize;
 
         type Unsigned: SimdElement;
 
@@ -65,7 +65,7 @@ macro_rules! impl_element {
             fn eq(self, other: Self) -> bool { self == other }
 
             #[inline]
-            fn as_usize(self) -> usize {
+            fn to_usize(self) -> usize {
                 self as usize
             }
 
@@ -394,7 +394,7 @@ where
         if min_index.eq(T::TRUE) {
             None
         } else {
-            Some(min_index.as_usize())
+            Some(min_index.to_usize())
         }
     }
 }

From 644bdfb2ac810c788300bfd79fcc0e0ec84cda5f Mon Sep 17 00:00:00 2001
From: Caleb Zulawski <caleb.zulawski@gmail.com>
Date: Sat, 17 Feb 2024 11:08:08 -0500
Subject: [PATCH 2/3] Revert "Merge pull request #385 from
 workingjubilee/make-an-ass-out-of-u-and-me"

This reverts commit 6ad779c3f6f8e935c12f5a9e488aeeaf0d829ff1, reversing
changes made to b2e1bcba2c9febb16561420392be2ca483fcad7f.
---
 crates/core_simd/src/lib.rs   | 1 -
 crates/core_simd/src/masks.rs | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
index a25723e11cef..6c66142f0c8d 100644
--- a/crates/core_simd/src/lib.rs
+++ b/crates/core_simd/src/lib.rs
@@ -5,7 +5,6 @@
     const_maybe_uninit_as_mut_ptr,
     const_mut_refs,
     convert_float_to_int,
-    core_intrinsics,
     decl_macro,
     inline_const,
     intra_doc_pointers,
diff --git a/crates/core_simd/src/masks.rs b/crates/core_simd/src/masks.rs
index ad7c68fc7f6f..aad91d7acb72 100644
--- a/crates/core_simd/src/masks.rs
+++ b/crates/core_simd/src/masks.rs
@@ -174,10 +174,7 @@ where
     #[must_use = "method returns a new mask and does not mutate the original value"]
     pub unsafe fn from_int_unchecked(value: Simd<T, N>) -> Self {
         // Safety: the caller must confirm this invariant
-        unsafe {
-            core::intrinsics::assume(<T as Sealed>::valid(value));
-            Self(mask_impl::Mask::from_int_unchecked(value))
-        }
+        unsafe { Self(mask_impl::Mask::from_int_unchecked(value)) }
     }
 
     /// Converts a vector of integers to a mask, where 0 represents `false` and -1

From d8439e90bd6c86fe4368807f5d1fc9952a36aeca Mon Sep 17 00:00:00 2001
From: Caleb Zulawski <caleb.zulawski@gmail.com>
Date: Sat, 17 Feb 2024 11:11:58 -0500
Subject: [PATCH 3/3] Add back core_intrinsics

---
 crates/core_simd/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
index 6c66142f0c8d..a25723e11cef 100644
--- a/crates/core_simd/src/lib.rs
+++ b/crates/core_simd/src/lib.rs
@@ -5,6 +5,7 @@
     const_maybe_uninit_as_mut_ptr,
     const_mut_refs,
     convert_float_to_int,
+    core_intrinsics,
     decl_macro,
     inline_const,
     intra_doc_pointers,