diff options
| author | Charles Gleason <charles_gleason@alumni.brown.edu> | 2020-01-28 11:59:50 -0500 |
|---|---|---|
| committer | Charles Gleason <charles_gleason@alumni.brown.edu> | 2020-01-28 13:00:06 -0500 |
| commit | 6c3e477d134511094ab301fc15c504cc79804e41 (patch) | |
| tree | 91a25ac61825e12a0638c11960482ad4ef27ed23 /src/liballoc | |
| parent | 81b6f8c3fc9098e7b1b6aad230ea7770d03070bc (diff) | |
| download | rust-6c3e477d134511094ab301fc15c504cc79804e41.tar.gz rust-6c3e477d134511094ab301fc15c504cc79804e41.zip | |
Reformat truncation section of clone_from
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index d0c56d83d72..7c45a6fe498 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -227,20 +227,20 @@ impl<K: Clone + Ord, V: Clone> BTreeClone for BTreeMap<K, V> { fn clone_from(&mut self, other: &Self) { // This truncates `self` to `other.len()` by calling `split_off` on // the first key after `other.len()` elements if it exists - if let Some(key) = { - if self.len() > other.len() { - let diff = self.len() - other.len(); - if diff <= other.len() { - self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone()) - } else { - self.iter().nth(other.len()).map(|pair| (*pair.0).clone()) - } + let split_off_key = if self.len() > other.len() { + let diff = self.len() - other.len(); + if diff <= other.len() { + self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone()) } else { - None + self.iter().nth(other.len()).map(|pair| (*pair.0).clone()) } - } { + } else { + None + }; + if let Some(key) = split_off_key { self.split_off(&key); } + let mut siter = self.range_mut(..); let mut oiter = other.iter(); // After truncation, `self` is at most as long as `other` so this loop |
