Merge pull request #947 from fitzgen/use-global-allocator-not-system

Use the global allocator, not the system allocator
rustwasm · Oct 10, 2018 · 35eeb71 · 35eeb71
2 parents d70149d + 3ceb044
commit 35eeb71
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -809,15 +809,15 @@ pub mod __rt {
     }
 
     if_std! {
-        use std::alloc::{System, GlobalAlloc, Layout};
+        use std::alloc::{alloc, dealloc, Layout};
         use std::mem;
 
         #[no_mangle]
         pub extern fn __wbindgen_malloc(size: usize) -> *mut u8 {
             let align = mem::align_of::<usize>();
             if let Ok(layout) = Layout::from_size_align(size, align) {
                 unsafe {
-                    let ptr = System.alloc(layout);
+                    let ptr = alloc(layout);
                     if !ptr.is_null() {
                         return ptr
                     }
@@ -836,7 +836,7 @@ pub mod __rt {
             }
             let align = mem::align_of::<usize>();
             let layout = Layout::from_size_align_unchecked(size, align);
-            System.dealloc(ptr, layout);
+            dealloc(ptr, layout);
         }
     }