about summary refs log tree commit diff
path: root/src/liballoc/tests
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-03 17:50:06 +0900
committerGitHub <noreply@github.com>2020-03-03 17:50:06 +0900
commit4699b29a04e84746e28ef688f02993c3b4d54951 (patch)
tree5a0bb1e2dc696937965e4e103524cf8a2cc80bd7 /src/liballoc/tests
parentdfacdda6494bf55bfd4af07cde1bc42d8a3c32e8 (diff)
parentd8e3557dbae23283f81d7bc45200413dd93ced4a (diff)
downloadrust-4699b29a04e84746e28ef688f02993c3b4d54951.tar.gz
rust-4699b29a04e84746e28ef688f02993c3b4d54951.zip
Rollup merge of #69609 - TimDiekmann:excess, r=Amanieu
Remove `usable_size` APIs

This removes the usable size APIs:
- remove `usable_size` (obv)
- change return type of allocating methods to include the allocated size
- remove `_excess` API

r? @Amanieu
closes rust-lang/wg-allocators#17
Diffstat (limited to 'src/liballoc/tests')
-rw-r--r--src/liballoc/tests/heap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/tests/heap.rs b/src/liballoc/tests/heap.rs
index 7fcfcf9b294..d159126f426 100644
--- a/src/liballoc/tests/heap.rs
+++ b/src/liballoc/tests/heap.rs
@@ -20,7 +20,7 @@ fn check_overalign_requests<T: AllocRef>(mut allocator: T) {
             unsafe {
                 let pointers: Vec<_> = (0..iterations)
                     .map(|_| {
-                        allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap()
+                        allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap().0
                     })
                     .collect();
                 for &ptr in &pointers {