about summary refs log tree commit diff
path: root/src/liballoc/arc.rs
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2018-04-20 21:05:13 -0700
committerSteven Fackler <sfackler@gmail.com>2018-04-22 10:08:17 -0700
commite513c1bd314bbeb6295a7a759de8833b52ff854d (patch)
tree538d71f49b7258fb3e55fdd6245dacd829f4dcf7 /src/liballoc/arc.rs
parent88873965137e752407d5797e7319410df2554f0c (diff)
downloadrust-e513c1bd314bbeb6295a7a759de8833b52ff854d.tar.gz
rust-e513c1bd314bbeb6295a7a759de8833b52ff854d.zip
Replace GlobalAlloc::oom with a lang item
Diffstat (limited to 'src/liballoc/arc.rs')
-rw-r--r--src/liballoc/arc.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 225b055d8ee..f5980f4599e 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -31,7 +31,7 @@ use core::hash::{Hash, Hasher};
 use core::{isize, usize};
 use core::convert::From;
 
-use alloc::{Global, Alloc, Layout, box_free};
+use alloc::{Global, Alloc, Layout, box_free, oom};
 use boxed::Box;
 use string::String;
 use vec::Vec;
@@ -553,7 +553,7 @@ impl<T: ?Sized> Arc<T> {
         let layout = Layout::for_value(&*fake_ptr);
 
         let mem = Global.alloc(layout)
-            .unwrap_or_else(|_| Global.oom());
+            .unwrap_or_else(|_| oom());
 
         // Initialize the real ArcInner
         let inner = set_data_ptr(ptr as *mut T, mem.as_ptr() as *mut u8) as *mut ArcInner<T>;