No need to duplicate the inherent method for stage0

frewsxcv · Sep 14, 2017 · 1462cab · 1462cab
1 parent 2184663
commit 1462cab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
@@ -662,22 +662,12 @@ impl<T: ?Sized> *const T {
  /// }
  /// # } }
  /// ```
- #[cfg(not(stage0))]
  #[unstable(feature = "align_offset", issue = "44488")]
  pub fn align_offset(self, align: usize) -> usize {
  unsafe {
  intrinsics::align_offset(self as *const _, align)
  }
  }
-
- #[cfg(stage0)]
- #[stable(feature = "rust1", since = "1.0.0")]
- /// remove me after the next release
- pub fn align_offset(self, align: usize) -> usize {
- unsafe {
- intrinsics::align_offset(self as *const _, align)
- }
- }
 }
 
 #[lang = "mut_ptr"]
@@ -901,22 +891,12 @@ impl<T: ?Sized> *mut T {
  /// }
  /// # } }
  /// ```
- #[cfg(not(stage0))]
  #[unstable(feature = "align_offset", issue = "44488")]
  pub fn align_offset(self, align: usize) -> usize {
  unsafe {
  intrinsics::align_offset(self as *const _, align)
  }
  }
-
- #[cfg(stage0)]
- #[stable(feature = "rust1", since = "1.0.0")]
- /// remove me after the next release
- pub fn align_offset(self, align: usize) -> usize {
- unsafe {
- intrinsics::align_offset(self as *const _, align)
- }
- }
 }
 
 // Equality for pointers

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -242,7 +242,7 @@
 #![feature(allocator_internals)]
 #![feature(allow_internal_unsafe)]
 #![feature(allow_internal_unstable)]
-#![cfg_attr(not(stage0), feature(align_offset))]
+#![feature(align_offset)]
 #![feature(asm)]
 #![feature(box_syntax)]
 #![feature(cfg_target_has_atomic)]