about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2018-04-03 08:51:02 +0900
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 22:53:22 +0200
commitfddf51ee0b9765484fc316dbf3d4feb8ceea715d (patch)
tree52814590ab7288801f78e8ee5493e156f3181017 /src/doc
parentfd242ee64c5488e64e2bb677d90f2460e017b7cb (diff)
downloadrust-fddf51ee0b9765484fc316dbf3d4feb8ceea715d.tar.gz
rust-fddf51ee0b9765484fc316dbf3d4feb8ceea715d.zip
Use NonNull<Void> instead of *mut u8 in the Alloc trait
Fixes #49608
Diffstat (limited to 'src/doc')
m---------src/doc/nomicon0
-rw-r--r--src/doc/unstable-book/src/language-features/global-allocator.md1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject 6a8f0a27e9a58c55c89d07bc43a176fdae5e051
+Subproject 498ac2997420f7b25f7cd0a3f8202950d8ad93e
diff --git a/src/doc/unstable-book/src/language-features/global-allocator.md b/src/doc/unstable-book/src/language-features/global-allocator.md
index 6ce12ba684d..a3f3ee65bf0 100644
--- a/src/doc/unstable-book/src/language-features/global-allocator.md
+++ b/src/doc/unstable-book/src/language-features/global-allocator.md
@@ -30,6 +30,7 @@ looks like:
 #![feature(global_allocator, allocator_api, heap_api)]
 
 use std::alloc::{GlobalAlloc, System, Layout, Void};
+use std::ptr::NonNull;
 
 struct MyAllocator;