diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-12 12:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 12:18:01 +0200 |
| commit | c852cc54434ae2cc2d8aa86b398e16378a593327 (patch) | |
| tree | d8445786fc6c9bd39aefb15595b2242c2158097a /src/libstd/sys | |
| parent | 740c9ea7035e9f70336a354a70ed34b9907b7e90 (diff) | |
| parent | e2d1d667e283de5183822b333cb3a5e08def9874 (diff) | |
| download | rust-c852cc54434ae2cc2d8aa86b398e16378a593327.tar.gz rust-c852cc54434ae2cc2d8aa86b398e16378a593327.zip | |
Rollup merge of #59857 - jethrogb:jb/sgx-test, r=Centril
SGX target: fix cfg(test) build
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/alloc.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/sgx/alloc.rs b/src/libstd/sys/sgx/alloc.rs index b385d567dd8..40daec758a9 100644 --- a/src/libstd/sys/sgx/alloc.rs +++ b/src/libstd/sys/sgx/alloc.rs @@ -1,4 +1,4 @@ -use crate::alloc::{self, GlobalAlloc, Layout, System}; +use crate::alloc::{GlobalAlloc, Layout, System}; use super::waitqueue::SpinMutex; @@ -36,11 +36,11 @@ unsafe impl GlobalAlloc for System { #[cfg(not(test))] #[no_mangle] pub unsafe extern "C" fn __rust_c_alloc(size: usize, align: usize) -> *mut u8 { - alloc::alloc(Layout::from_size_align_unchecked(size, align)) + crate::alloc::alloc(Layout::from_size_align_unchecked(size, align)) } #[cfg(not(test))] #[no_mangle] pub unsafe extern "C" fn __rust_c_dealloc(ptr: *mut u8, size: usize, align: usize) { - alloc::dealloc(ptr, Layout::from_size_align_unchecked(size, align)) + crate::alloc::dealloc(ptr, Layout::from_size_align_unchecked(size, align)) } |