diff options
| author | bors <bors@rust-lang.org> | 2017-07-30 01:40:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-30 01:40:11 +0000 |
| commit | 5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9 (patch) | |
| tree | 1efdfb555e8266e747a7e2c453d0ff84d5613c90 /src/liballoc/allocator.rs | |
| parent | 53bf7903fa7ebabca85f5937667956177989e345 (diff) | |
| parent | 16c3fd9f3d3dd6667c1966d6a62e56bf9deed0fd (diff) | |
| download | rust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.tar.gz rust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.zip | |
Auto merge of #43551 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests - Successful merges: #43409, #43501, #43509, #43512, #43513, #43536, #43544, #43549 - Failed merges:
Diffstat (limited to 'src/liballoc/allocator.rs')
| -rw-r--r-- | src/liballoc/allocator.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/allocator.rs b/src/liballoc/allocator.rs index 66e0bf81c90..42111301a9f 100644 --- a/src/liballoc/allocator.rs +++ b/src/liballoc/allocator.rs @@ -215,6 +215,7 @@ impl Layout { /// of each element in the array. /// /// On arithmetic overflow, returns `None`. + #[inline] pub fn repeat(&self, n: usize) -> Option<(Self, usize)> { let padded_size = match self.size.checked_add(self.padding_needed_for(self.align)) { None => return None, |