diff options
| author | bors <bors@rust-lang.org> | 2018-10-30 11:38:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-30 11:38:31 +0000 |
| commit | e8aef7cae14bc7a56859408c90253e9bcc07fcff (patch) | |
| tree | 01369c637678ec513ba6f874aa1e05ce8e88dbbb /src/liballoc | |
| parent | b1ca3907e00211b2f645133af3574ca22e4f4f4d (diff) | |
| parent | c16ff6e7e86e01d7e5408d28f40a255546f37c6e (diff) | |
| download | rust-e8aef7cae14bc7a56859408c90253e9bcc07fcff.tar.gz rust-e8aef7cae14bc7a56859408c90253e9bcc07fcff.zip | |
Auto merge of #55502 - kennytm:rollup, r=kennytm
Rollup of 12 pull requests
Successful merges:
- #54885 (Don't lint 'unused_parens` on `if (break _) { .. }`)
- #55205 (Improve a few cases of collecting to an FxHash(Map/Set))
- #55450 (msp430: remove the whole Atomic* API)
- #55459 (Add UI test for #49296)
- #55472 (Use opt.take() instead of mem::replace(opt, None))
- #55473 (Take advantage of impl Iterator in (transitive/elaborate)_bounds)
- #55474 (Fix validation false positive)
- #55476 (Change a flat_map with 0/1-element vecs to a filter_map)
- #55487 (Adjust Ids of path segments in visibility modifiers)
- #55493 (Doc fixes)
- #55494 (borrowck=migrate must look at parents of closures)
- #55496 (Update clippy)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 571f35a2031..88e76033f27 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -36,6 +36,8 @@ use vec::Vec; const INITIAL_CAPACITY: usize = 7; // 2^3 - 1 const MINIMUM_CAPACITY: usize = 1; // 2 - 1 +#[cfg(target_pointer_width = "16")] +const MAXIMUM_ZST_CAPACITY: usize = 1 << (16 - 1); // Largest possible power of two #[cfg(target_pointer_width = "32")] const MAXIMUM_ZST_CAPACITY: usize = 1 << (32 - 1); // Largest possible power of two #[cfg(target_pointer_width = "64")] |