Skip to content

Commit 1462cab

Browse files
committed
No need to duplicate the inherent method for stage0
1 parent 2184663 commit 1462cab

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

src/libcore/ptr.rs

-20
Original file line numberDiff line numberDiff line change
@@ -662,22 +662,12 @@ impl<T: ?Sized> *const T {
662662
/// }
663663
/// # } }
664664
/// ```
665-
#[cfg(not(stage0))]
666665
#[unstable(feature = "align_offset", issue = "44488")]
667666
pub fn align_offset(self, align: usize) -> usize {
668667
unsafe {
669668
intrinsics::align_offset(self as *const _, align)
670669
}
671670
}
672-
673-
#[cfg(stage0)]
674-
#[stable(feature = "rust1", since = "1.0.0")]
675-
/// remove me after the next release
676-
pub fn align_offset(self, align: usize) -> usize {
677-
unsafe {
678-
intrinsics::align_offset(self as *const _, align)
679-
}
680-
}
681671
}
682672

683673
#[lang = "mut_ptr"]
@@ -901,22 +891,12 @@ impl<T: ?Sized> *mut T {
901891
/// }
902892
/// # } }
903893
/// ```
904-
#[cfg(not(stage0))]
905894
#[unstable(feature = "align_offset", issue = "44488")]
906895
pub fn align_offset(self, align: usize) -> usize {
907896
unsafe {
908897
intrinsics::align_offset(self as *const _, align)
909898
}
910899
}
911-
912-
#[cfg(stage0)]
913-
#[stable(feature = "rust1", since = "1.0.0")]
914-
/// remove me after the next release
915-
pub fn align_offset(self, align: usize) -> usize {
916-
unsafe {
917-
intrinsics::align_offset(self as *const _, align)
918-
}
919-
}
920900
}
921901

922902
// Equality for pointers

src/libstd/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
#![feature(allocator_internals)]
243243
#![feature(allow_internal_unsafe)]
244244
#![feature(allow_internal_unstable)]
245-
#![cfg_attr(not(stage0), feature(align_offset))]
245+
#![feature(align_offset)]
246246
#![feature(asm)]
247247
#![feature(box_syntax)]
248248
#![feature(cfg_target_has_atomic)]

0 commit comments

Comments
 (0)