move internals & utilities needed by the feature into a seperate module

Author: xacrimon

library/core/src/cmp.rs

@@ -26,8 +26,6 @@
 #![stable(feature = "rust1", since = "1.0.0")]
 
 mod bytewise;
-#[cfg(not(bootstrap))]
-mod pattern;
 pub(crate) use bytewise::BytewiseEq;
 
 use self::Ordering::*;

library/core/src/intrinsics/mod.rs

@@ -1965,7 +1965,6 @@ pub const fn needs_drop<T: ?Sized>() -> bool {
 /// of bounds or arithmetic overflow occurs then this operation is undefined behavior.
 ///
 /// The stabilized version of this intrinsic is [`pointer::offset`].
-#[cfg_attr(not(bootstrap), lang = "offset")]
 #[must_use = "returns a new pointer rather than modifying its argument"]
 #[rustc_intrinsic_const_stable_indirect]
 #[rustc_nounwind]
@@ -4203,7 +4202,6 @@ pub const fn type_id<T: ?Sized + 'static>() -> u128 {
 /// This is used to implement functions like `slice::from_raw_parts_mut` and
 /// `ptr::from_raw_parts` in a way compatible with the compiler being able to
 /// change the possible layouts of pointers.
-#[cfg_attr(not(bootstrap), lang = "aggregate_raw_ptr")]
 #[rustc_nounwind]
 #[unstable(feature = "core_intrinsics", issue = "none")]
 #[rustc_intrinsic_const_stable_indirect]

library/core/src/lib.rs

@@ -252,6 +252,9 @@ pub use crate::macros::cfg_match;
 #[macro_use]
 mod internal_macros;
 
+#[cfg(not(bootstrap))]
+mod match_internals;
+
 #[path = "num/shells/int_macros.rs"]
 #[macro_use]
 mod int_macros;

library/core/src/cmp/pattern.rs library/core/src/match_internals.rslibrary/core/src/cmp/pattern.rs renamed to library/core/src/match_internals.rs

@@ -1,6 +1,15 @@
 use crate::cmp::BytewiseEq;
-use crate::intrinsics::compare_bytes;
-use crate::mem;
+use crate::{intrinsics, mem};
+
+#[lang = "aggregate_raw_ptr"]
+const fn aggregate_raw_ptr<T>(data: *const T, meta: usize) -> *const [T] {
+    intrinsics::aggregate_raw_ptr(data, meta)
+}
+
+#[lang = "offset"]
+const fn offset<T>(ptr: *const T, offset: usize) -> *const T {
+    unsafe { intrinsics::offset(ptr, offset) }
+}
 
 #[lang = "PatternConstEq"]
 #[const_trait]
@@ -68,7 +77,8 @@ where
         // The two slices have been checked to have the same size above.
         unsafe {
             let size = mem::size_of_val(self);
-            compare_bytes(self.as_ptr() as *const u8, other.as_ptr() as *const u8, size) == 0
+            intrinsics::compare_bytes(self.as_ptr() as *const u8, other.as_ptr() as *const u8, size)
+                == 0
         }
     }
 }