diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-27 14:12:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-27 14:12:42 +0200 |
| commit | fa66b8a1540fc09928630e5d77537d5443c72af4 (patch) | |
| tree | 13fb0a065979b9f24a7ff84dfcefcf95c8aad128 /src/liballoc | |
| parent | 7475db5cfa39438c7e0ef8e0d05d6c286f1ae48d (diff) | |
| parent | be12ab070d733303355d433d68efb870e3da753b (diff) | |
| download | rust-fa66b8a1540fc09928630e5d77537d5443c72af4.tar.gz rust-fa66b8a1540fc09928630e5d77537d5443c72af4.zip | |
Rollup merge of #60316 - mgeier:rename-capacity-parameter, r=joshtriplett
Use "capacity" as parameter name in with_capacity() methods See #60271. The only place where I didn't change the parameter name is `RawVec`. The problem is that it has a `.cap()` method instead of the usual `.capacity()`: https://github.com/rust-lang/rust/blob/597f432489f12a3f33419daa039ccef11a12c4fd/src/liballoc/raw_vec.rs#L200-L210 Changing this would be a breaking change, and I guess that's not worth it. But since I didn't change `.cap()` there, I didn't change the `cap` parameter name to `capacity`, either.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 05225e5a25b..d65c24f7350 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -369,7 +369,7 @@ impl<T> VecDeque<T> { VecDeque::with_capacity(INITIAL_CAPACITY) } - /// Creates an empty `VecDeque` with space for at least `n` elements. + /// Creates an empty `VecDeque` with space for at least `capacity` elements. /// /// # Examples /// @@ -379,10 +379,10 @@ impl<T> VecDeque<T> { /// let vector: VecDeque<u32> = VecDeque::with_capacity(10); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub fn with_capacity(n: usize) -> VecDeque<T> { + pub fn with_capacity(capacity: usize) -> VecDeque<T> { // +1 since the ringbuffer always leaves one space empty - let cap = cmp::max(n + 1, MINIMUM_CAPACITY + 1).next_power_of_two(); - assert!(cap > n, "capacity overflow"); + let cap = cmp::max(capacity + 1, MINIMUM_CAPACITY + 1).next_power_of_two(); + assert!(cap > capacity, "capacity overflow"); VecDeque { tail: 0, |
