bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #84209 - pickfire:patch-3, r=jyn514

Browse source 
Merge same condition branch in vec spec_extend

Follow up of https://github.com/rust-lang/rust/pull/83726#discussion_r613438246
This commit is contained in:
bors 2021-04-15 15:18:16 +00:00
commit 2962e7c008
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/alloc/src/vec/spec_extend.rs
View file

@ -26,15 +26,13 @@ where
default fn spec_extend(&mut self, iterator: I) { default fn spec_extend(&mut self, iterator: I) {
// This is the case for a TrustedLen iterator. // This is the case for a TrustedLen iterator.
let (low, high) = iterator.size_hint(); let (low, high) = iterator.size_hint();
if let Some(high_value) = high { if let Some(additional) = high {
debug_assert_eq!( debug_assert_eq!(
low, low,
high_value, additional,
"TrustedLen iterator's size hint is not exact: {:?}", "TrustedLen iterator's size hint is not exact: {:?}",
(low, high) (low, high)
); );
}
if let Some(additional) = high {
self.reserve(additional); self.reserve(additional);
unsafe { unsafe {
let mut ptr = self.as_mut_ptr().add(self.len()); let mut ptr = self.as_mut_ptr().add(self.len());