X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fliballoc%2Falloc.rs;h=f3877e51a6633f2589885ce08015fa5d0da46b85;hb=55b5ab83592d607a6ba8793ac76bedadb05e5bab;hp=096cb51e0d3efe3900c389dbbd023d1ec23e9650;hpb=96530344ef951c79e07cad69cf65eddb876b0e2d;p=rust.git diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 096cb51e0d3..f3877e51a66 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -34,6 +34,9 @@ fn __rust_realloc(ptr: *mut u8, /// This type implements the [`Alloc`] trait by forwarding calls /// to the allocator registered with the `#[global_allocator]` attribute /// if there is one, or the `std` crate’s default. +/// +/// Note: while this type is unstable, the functionality it provides can be +/// accessed through the [free functions in `alloc`](index.html#functions). #[unstable(feature = "allocator_api", issue = "32838")] #[derive(Copy, Clone, Default, Debug)] pub struct Global; @@ -227,9 +230,9 @@ pub fn handle_alloc_error(layout: Layout) -> ! { #[cfg(test)] mod tests { extern crate test; - use self::test::Bencher; - use boxed::Box; - use alloc::{Global, Alloc, Layout, handle_alloc_error}; + use test::Bencher; + use crate::boxed::Box; + use crate::alloc::{Global, Alloc, Layout, handle_alloc_error}; #[test] fn allocate_zeroed() {