Skip to content

Commit

Permalink
Rollup merge of #76481 - moonheart08:vec_deque_constify, r=sfackler
Browse files Browse the repository at this point in the history
Convert repetitive target_pointer_width checks to const solution.

Simply a quick code tidying change. Not sure if more needs to be said.
  • Loading branch information
tmandry committed Sep 9, 2020
2 parents 09bfb7e + e02952c commit 0d20cf8
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions library/alloc/src/collections/vec_deque.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@ mod tests;

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")]
const MAXIMUM_ZST_CAPACITY: usize = 1 << (64 - 1); // Largest possible power of two

const MAXIMUM_ZST_CAPACITY: usize = 1 << (core::mem::size_of::<usize>() * 8 - 1); // Largest possible power of two

/// A double-ended queue implemented with a growable ring buffer.
///
Expand Down

0 comments on commit 0d20cf8

Please sign in to comment.