diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-01 07:37:38 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-01 11:59:08 -0600 |
| commit | 683a3db01fcd00998a36e494ee39209b3105cfb9 (patch) | |
| tree | 544717784e73eb774297aee52ce814937d3ad380 /src/libcore/alloc.rs | |
| parent | 8c069ceba81a0fffc1ce95aaf7e8339e11bf2796 (diff) | |
| download | rust-683a3db01fcd00998a36e494ee39209b3105cfb9.tar.gz rust-683a3db01fcd00998a36e494ee39209b3105cfb9.zip | |
Switch to bootstrapping from 1.29 beta
Diffstat (limited to 'src/libcore/alloc.rs')
| -rw-r--r-- | src/libcore/alloc.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs index b6ac248b79f..39ec5d6411c 100644 --- a/src/libcore/alloc.rs +++ b/src/libcore/alloc.rs @@ -19,10 +19,6 @@ use usize; use ptr::{self, NonNull}; use num::NonZeroUsize; -#[unstable(feature = "alloc_internals", issue = "0")] -#[cfg(stage0)] -pub type Opaque = u8; - /// Represents the combination of a starting address and /// a total capacity of the returned block. #[unstable(feature = "allocator_api", issue = "32838")] @@ -48,7 +44,7 @@ fn size_align<T>() -> (usize, usize) { /// use specific allocators with looser requirements.) #[stable(feature = "alloc_layout", since = "1.28.0")] #[derive(Copy, Clone, Debug, PartialEq, Eq)] -#[cfg_attr(not(stage0), lang = "alloc_layout")] +#[lang = "alloc_layout"] pub struct Layout { // size of the requested block of memory, measured in bytes. size_: usize, |