diff options
| author | bors <bors@rust-lang.org> | 2016-05-11 07:03:12 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-11 07:03:12 -0700 |
| commit | e37f8593e42335829e98fed27b8ececbad61a05d (patch) | |
| tree | 4c3ed31a0c4bda41b14975493fa1a80425a24b8f /src/liballoc | |
| parent | c0495417416c8e0687bc6a997507c403627f6568 (diff) | |
| parent | 403970f96c002fd194eb6c23f927438bac39f725 (diff) | |
| download | rust-e37f8593e42335829e98fed27b8ececbad61a05d.tar.gz rust-e37f8593e42335829e98fed27b8ececbad61a05d.zip | |
Auto merge of #33556 - steveklabnik:rollup, r=steveklabnik
Rollup of 9 pull requests - Successful merges: #33129, #33260, #33345, #33386, #33522, #33524, #33528, #33539, #33542 - Failed merges: #33342, #33475, #33517
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index c407cef25e7..8b3168b29aa 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -147,6 +147,7 @@ impl<T> RawVec<T> { /// Gets the capacity of the allocation. /// /// This will always be `usize::MAX` if `T` is zero-sized. + #[inline(always)] pub fn cap(&self) -> usize { if mem::size_of::<T>() == 0 { !0 |