diff options
| author | bors <bors@rust-lang.org> | 2017-06-29 08:40:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-29 08:40:39 +0000 |
| commit | 7acce3724d6ba5cb84d6eef6d6847f8573a1fe5a (patch) | |
| tree | 1cdd6109e4d61790d67fb50fa25a88a8da01fdee /src/liballoc/allocator.rs | |
| parent | dc2003b7cc1af7d7beee0b1ceec3d811c28cb35e (diff) | |
| parent | d3329d7102db78a408bc059600c48fc7f99a0e67 (diff) | |
| download | rust-7acce3724d6ba5cb84d6eef6d6847f8573a1fe5a.tar.gz rust-7acce3724d6ba5cb84d6eef6d6847f8573a1fe5a.zip | |
Auto merge of #42964 - arielb1:rollup, r=arielb1
Rollup of 12 pull requests - Successful merges: #42219, #42831, #42832, #42884, #42886, #42901, #42919, #42920, #42946, #42953, #42955, #42958 - Failed merges:
Diffstat (limited to 'src/liballoc/allocator.rs')
| -rw-r--r-- | src/liballoc/allocator.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/allocator.rs b/src/liballoc/allocator.rs index 9bddce29957..bf38629ed38 100644 --- a/src/liballoc/allocator.rs +++ b/src/liballoc/allocator.rs @@ -873,7 +873,7 @@ pub unsafe trait Alloc { { let k = Layout::new::<T>(); if k.size() > 0 { - unsafe { self.alloc(k).map(|p|Unique::new(*p as *mut T)) } + unsafe { self.alloc(k).map(|p| Unique::new(p as *mut T)) } } else { Err(AllocErr::invalid_input("zero-sized type invalid for alloc_one")) } |