diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-02-07 13:49:48 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-02-07 13:49:48 +0100 |
| commit | 01f6f40ac24c32d61d2746d0f031279cf86ddd2f (patch) | |
| tree | afd5f44b650e0e1aee900be8d4de481b55235b79 /build_sysroot | |
| parent | fbe36ad68a226f389bf64f67ea60449b8d41efbf (diff) | |
| download | rust-01f6f40ac24c32d61d2746d0f031279cf86ddd2f.tar.gz rust-01f6f40ac24c32d61d2746d0f031279cf86ddd2f.zip | |
Rustup to rustc 1.43.0-nightly (442ae7f04 2020-02-06)
Diffstat (limited to 'build_sysroot')
| -rw-r--r-- | build_sysroot/alloc_system/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_sysroot/alloc_system/lib.rs b/build_sysroot/alloc_system/lib.rs index a942fa8d95e..c9815853de1 100644 --- a/build_sysroot/alloc_system/lib.rs +++ b/build_sysroot/alloc_system/lib.rs @@ -41,7 +41,7 @@ const MIN_ALIGN: usize = 8; target_arch = "sparc64")))] #[allow(dead_code)] const MIN_ALIGN: usize = 16; -use core::alloc::{Alloc, GlobalAlloc, AllocErr, Layout}; +use core::alloc::{AllocRef, GlobalAlloc, AllocErr, Layout}; use core::ptr::NonNull; /// The default memory allocator provided by the operating system. /// @@ -70,7 +70,7 @@ use core::ptr::NonNull; #[stable(feature = "alloc_system_type", since = "1.28.0")] pub struct System; #[unstable(feature = "allocator_api", issue = "32838")] -unsafe impl Alloc for System { +unsafe impl AllocRef for System { #[inline] unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> { NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr) |