diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-04-03 16:00:04 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-04-12 22:53:13 +0200 |
| commit | 157ff8cd0562eefdd7aa296395c38a7bc259a4b9 (patch) | |
| tree | 162a8b87c71c590b4ae1a594c4087819fb719b57 /src/liballoc/alloc.rs | |
| parent | 86753ce1cc520bfe50ae89f09ec47f313ce900eb (diff) | |
| download | rust-157ff8cd0562eefdd7aa296395c38a7bc259a4b9.tar.gz rust-157ff8cd0562eefdd7aa296395c38a7bc259a4b9.zip | |
Remove the now-unit-struct AllocErr parameter of oom()
Diffstat (limited to 'src/liballoc/alloc.rs')
| -rw-r--r-- | src/liballoc/alloc.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 73bc78eb8a2..a7b5864016c 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -136,8 +136,8 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 { align as *mut u8 } else { let layout = Layout::from_size_align_unchecked(size, align); - Global.alloc(layout).unwrap_or_else(|err| { - Global.oom(err) + Global.alloc(layout).unwrap_or_else(|_| { + Global.oom() }) } } @@ -166,7 +166,7 @@ mod tests { unsafe { let layout = Layout::from_size_align(1024, 1).unwrap(); let ptr = Global.alloc_zeroed(layout.clone()) - .unwrap_or_else(|e| Global.oom(e)); + .unwrap_or_else(|_| Global.oom()); let end = ptr.offset(layout.size() as isize); let mut i = ptr; |
