diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2018-05-24 11:28:20 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-05-30 10:50:59 +0200 |
| commit | a553964123d9e65fc483e608864d880ba1909300 (patch) | |
| tree | 3a3654a25d84c45d371ec26bd83bdb3b7b58a6b8 /components/allocator/lib.rs | |
| parent | 11a89bcc47c73701d8809cf33163a1f61d792b17 (diff) | |
| download | servo-a553964123d9e65fc483e608864d880ba1909300.tar.gz servo-a553964123d9e65fc483e608864d880ba1909300.zip | |
Upgrade to rustc 1.28.0-nightly (524ad9b9e 2018-05-29)
Fixes https://github.com/servo/servo/issues/20844
Diffstat (limited to 'components/allocator/lib.rs')
| -rw-r--r-- | components/allocator/lib.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/components/allocator/lib.rs b/components/allocator/lib.rs index 3d933599688..c2f2d9796a4 100644 --- a/components/allocator/lib.rs +++ b/components/allocator/lib.rs @@ -17,7 +17,7 @@ pub use platform::*; mod platform { extern crate jemalloc_sys as ffi; - use std::alloc::{GlobalAlloc, Layout, Opaque, System}; + use std::alloc::{GlobalAlloc, Layout, Opaque}; use std::os::raw::{c_int, c_void}; /// Get the size of a heap block. @@ -94,11 +94,6 @@ mod platform { let flags = layout_to_flags(layout.align(), new_size); ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque } - - #[inline] - fn oom(&self) -> ! { - System.oom() - } } } |