##// END OF EJS Templates
rust-dirstatemap: inline the last `get_or_insert` call...
Raphaël Gomès -
r50020:74c996f8 default
parent child Browse files
Show More
@@ -574,20 +574,6 b" impl<'on_disk> DirstateMap<'on_disk> {"
574 }
574 }
575 }
575 }
576
576
577 pub(super) fn get_or_insert<'tree, 'path>(
578 &'tree mut self,
579 path: &HgPath,
580 ) -> Result<&'tree mut Node<'on_disk>, DirstateV2ParseError> {
581 Self::get_or_insert_node(
582 self.on_disk,
583 &mut self.unreachable_bytes,
584 &mut self.root,
585 path,
586 WithBasename::to_cow_owned,
587 |_| {},
588 )
589 }
590
591 fn get_or_insert_node<'tree, 'path>(
577 fn get_or_insert_node<'tree, 'path>(
592 on_disk: &'on_disk [u8],
578 on_disk: &'on_disk [u8],
593 unreachable_bytes: &mut u32,
579 unreachable_bytes: &mut u32,
@@ -1438,7 +1424,14 b' impl OwningDirstateMap {'
1438 }
1424 }
1439 self.with_dmap_mut(|map| {
1425 self.with_dmap_mut(|map| {
1440 for path in files_with_p2_info.iter() {
1426 for path in files_with_p2_info.iter() {
1441 let node = map.get_or_insert(path)?;
1427 let node = DirstateMap::get_or_insert_node(
1428 map.on_disk,
1429 &mut map.unreachable_bytes,
1430 &mut map.root,
1431 path,
1432 WithBasename::to_cow_owned,
1433 |_| {},
1434 )?;
1442 let entry =
1435 let entry =
1443 node.data.as_entry_mut().expect("entry should exist");
1436 node.data.as_entry_mut().expect("entry should exist");
1444 entry.drop_merge_data();
1437 entry.drop_merge_data();
General Comments 0
You need to be logged in to leave comments. Login now