This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12532

rust-dirstatemap: use a checked sub instead of a potentially underflowing one
Needs ReviewPublic

Authored by Alphare on Tue, Apr 12, 12:05 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This was missed in 2593873cda0f

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 33095

rust/hg-core/src/dirstate_tree/dirstate_map.rs

map.on_disk, map.on_disk,
unreachable_bytes, unreachable_bytes,
&mut map.root, &mut map.root,
key, key,
|_ancestor| {}, |_ancestor| {},
)? )?
.and_then(|node| { .and_then(|node| {
if let Some(source) = &node.copy_source { if let Some(source) = &node.copy_source {
*count -= 1; *count = count
.checked_sub(1)
.expect("nodes_with_copy_source_count should be >= 0");
DirstateMap::count_dropped_path(unreachable_bytes, source); DirstateMap::count_dropped_path(unreachable_bytes, source);
} }
node.copy_source.take().map(Cow::into_owned) node.copy_source.take().map(Cow::into_owned)
})) }))
}) })
} }
pub fn copy_map_insert( pub fn copy_map_insert(