From 3ceb0441d365e3fd265739fb21d478dfacb7b029 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Tue, 9 Oct 2018 18:08:46 -0700
Subject: [PATCH] Use the global allocator, not the system allocator

This was previously causing us to accidentally always pull in the system
allocator, even if users were trying to just use a custom global allocator.
---
 src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 4f808f47..2973233c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -809,7 +809,7 @@ pub mod __rt {
     }
 
     if_std! {
-        use std::alloc::{System, GlobalAlloc, Layout};
+        use std::alloc::{alloc, dealloc, Layout};
         use std::mem;
 
         #[no_mangle]
@@ -817,7 +817,7 @@ pub mod __rt {
             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);
         }
     }