diff options
| author | Sebastian Imlay <sebastian@easypost.com> | 2020-02-14 10:57:45 -0800 |
|---|---|---|
| committer | Sebastian Imlay <sebastian@easypost.com> | 2020-02-14 10:57:45 -0800 |
| commit | a2661695e8953199a746895e2e65225a9922753b (patch) | |
| tree | 3e88fd5c2b598f50c919ad1e5ee5cb2abe5b5886 /src/libstd/alloc.rs | |
| parent | 35c4aae99ece980c7c594940724f0728fcccf226 (diff) | |
| parent | e168dcd254d0a6a0cbaad5f2c054ce5116a07119 (diff) | |
| download | rust-a2661695e8953199a746895e2e65225a9922753b.tar.gz rust-a2661695e8953199a746895e2e65225a9922753b.zip | |
Merge branch 'master' of github.com:rust-lang/rust into add-tvSO-target
Diffstat (limited to 'src/libstd/alloc.rs')
| -rw-r--r-- | src/libstd/alloc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 7fd55af1694..8965c6860c4 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -133,9 +133,9 @@ pub use alloc_crate::alloc::*; #[derive(Debug, Default, Copy, Clone)] pub struct System; -// The Alloc impl just forwards to the GlobalAlloc impl, which is in `std::sys::*::alloc`. +// The AllocRef impl just forwards to the GlobalAlloc impl, which is in `std::sys::*::alloc`. #[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) |