Skip to content

Commit 6c3e477

Browse files
committed
Reformat truncation section of clone_from
1 parent 81b6f8c commit 6c3e477

File tree

1 file changed

+10
-10
lines changed
  • src/liballoc/collections/btree

1 file changed

+10
-10
lines changed

src/liballoc/collections/btree/map.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -227,20 +227,20 @@ impl<K: Clone + Ord, V: Clone> BTreeClone for BTreeMap<K, V> {
227227
fn clone_from(&mut self, other: &Self) {
228228
// This truncates `self` to `other.len()` by calling `split_off` on
229229
// the first key after `other.len()` elements if it exists
230-
if let Some(key) = {
231-
if self.len() > other.len() {
232-
let diff = self.len() - other.len();
233-
if diff <= other.len() {
234-
self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone())
235-
} else {
236-
self.iter().nth(other.len()).map(|pair| (*pair.0).clone())
237-
}
230+
let split_off_key = if self.len() > other.len() {
231+
let diff = self.len() - other.len();
232+
if diff <= other.len() {
233+
self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone())
238234
} else {
239-
None
235+
self.iter().nth(other.len()).map(|pair| (*pair.0).clone())
240236
}
241-
} {
237+
} else {
238+
None
239+
};
240+
if let Some(key) = split_off_key {
242241
self.split_off(&key);
243242
}
243+
244244
let mut siter = self.range_mut(..);
245245
let mut oiter = other.iter();
246246
// After truncation, `self` is at most as long as `other` so this loop

0 commit comments

Comments
 (0)