diff options
| author | Mike Hommey <mh@glandium.org> | 2018-05-31 15:57:43 +0900 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-06-11 13:47:23 -0700 |
| commit | f6ab74b8e7efed01c1045773b6693f23f6ebd93c (patch) | |
| tree | 41bdf1b52eed30d5d203bd8f95ecfa839047be74 /src/libstd/collections | |
| parent | 0b7c9e756e8bee2efd4f6929c79f9e3ed9115689 (diff) | |
| download | rust-f6ab74b8e7efed01c1045773b6693f23f6ebd93c.tar.gz rust-f6ab74b8e7efed01c1045773b6693f23f6ebd93c.zip | |
Remove alloc::Opaque and use *mut u8 as pointer type for GlobalAlloc
Diffstat (limited to 'src/libstd/collections')
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index d997fb28d42..55f9f4f7cfe 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -1124,7 +1124,7 @@ unsafe impl<#[may_dangle] K, #[may_dangle] V> Drop for RawTable<K, V> { let (layout, _) = calculate_layout::<K, V>(self.capacity()) .unwrap_or_else(|_| unsafe { hint::unreachable_unchecked() }); unsafe { - Global.dealloc(NonNull::new_unchecked(self.hashes.ptr()).as_opaque(), layout); + Global.dealloc(NonNull::new_unchecked(self.hashes.ptr()).cast(), layout); // Remember how everything was allocated out of one buffer // during initialization? We only need one call to free here. } |