diff options
| author | bors <bors@rust-lang.org> | 2020-05-29 19:50:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-29 19:50:22 +0000 |
| commit | 4bd32c98047a809ba5fd1fac2aa044638e5f2105 (patch) | |
| tree | 2ab4b52a13d0ec1df564fac39c011993112c9709 /src/liballoc | |
| parent | 96dd4690c3aa70ec312448c3f2d50e6dc6fb87df (diff) | |
| parent | 180a92cad72fc6fa9fad5a0f97db24703fe280bf (diff) | |
| download | rust-4bd32c98047a809ba5fd1fac2aa044638e5f2105.tar.gz rust-4bd32c98047a809ba5fd1fac2aa044638e5f2105.zip | |
Auto merge of #72747 - Dylan-DPC:rollup-vvydkgl, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #72310 (Add Peekable::next_if) - #72383 (Suggest using std::mem::drop function instead of explicit destructor call) - #72398 (SocketAddr and friends now correctly pad its content) - #72465 (Warn about unused captured variables) - #72568 (Implement total_cmp for f32, f64) - #72572 (Add some regression tests) - #72591 (librustc_middle: Rename upvar_list to closure_captures) - #72701 (Fix grammar in liballoc raw_vec) - #72731 (Add missing empty line in E0619 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index 2bd4733db42..56e284a12fa 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -315,7 +315,7 @@ impl<T, A: AllocRef> RawVec<T, A> { /// `used_capacity + needed_extra_capacity` elements. If it doesn't already, /// will reallocate the minimum possible amount of memory necessary. /// Generally this will be exactly the amount of memory necessary, - /// but in principle the allocator is free to give back more than + /// but in principle the allocator is free to give back more than what /// we asked for. /// /// If `used_capacity` exceeds `self.capacity()`, this may fail to actually allocate |