Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-02)"

Browse source 
This reverts commit 46ad811017.
This commit is contained in:
Josh Matthews 2018-05-18 11:44:47 -05:00
parent a8bdd44ece
commit e7979380ba
6 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/allocator/lib.rs
View file

@ -17,7 +17,7 @@ pub use platform::*;
mod platform {
extern crate jemalloc_sys as ffi;
use std::alloc::{GlobalAlloc, Layout, Opaque};
use std::alloc::{GlobalAlloc, Layout, Opaque, System};
use std::os::raw::{c_int, c_void};
/// Get the size of a heap block.
@ -94,6 +94,11 @@ 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()
}
}
}