diff options
| author | bors <bors@rust-lang.org> | 2021-09-05 10:11:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-05 10:11:37 +0000 |
| commit | 7e1e3eb5e19c7d1a4eabe4da22bf2aa085772766 (patch) | |
| tree | 17f18508f3871b25d4aef2b72b6a611f4065b2ce /library/alloc | |
| parent | 6b9a227b12ea7a6c007500d834fcb5e3969b3fdc (diff) | |
| parent | b4d06bfa8f7c3a836fb124307bdd3ec5007fac73 (diff) | |
Auto merge of #88662 - m-ou-se:rollup-h6lgp7k, r=m-ou-se
Rollup of 4 pull requests Successful merges: - #88257 (Provide more context on incorrect inner attribute) - #88432 (Fix a typo in raw_vec) - #88511 (x.py clippy: don't run with --all-targets by default) - #88657 (Fix 2021 `dyn` suggestion that used code as label) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/raw_vec.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs index 3caada06f6b..be21018512d 100644 --- a/library/alloc/src/raw_vec.rs +++ b/library/alloc/src/raw_vec.rs @@ -323,7 +323,7 @@ impl<T, A: Allocator> RawVec<T, A> { pub fn reserve(&mut self, len: usize, additional: usize) { // Callers expect this function to be very cheap when there is already sufficient capacity. // Therefore, we move all the resizing and error-handling logic from grow_amortized and - // handle_reserve behind a call, while making sure that the this function is likely to be + // handle_reserve behind a call, while making sure that this function is likely to be // inlined as just a comparison and a call if the comparison fails. #[cold] fn do_reserve_and_handle<T, A: Allocator>( |