itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring to use Vacant/Occupied instead of remove/insert

Browse Source
This commit is contained in:
Takayuki Nakata 2020-01-14 22:11:16 +09:00
parent 8076f578a3
commit 438d005b2c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cargo/util/config/mod.rs
View File

@ -1005,12 +1005,15 @@ impl Config {
}
if let CV::Table(map, _) = value {
let base_map = self.values_mut()?;
for (k, v) in map {
if let Some(mut base_map) = self.values_mut()?.remove(&k) {
base_map.merge(v, true)?;
self.values_mut()?.insert(k.into(), base_map);
} else {
self.values_mut()?.insert(k.into(), v);
match base_map.entry(k) {
Vacant(entry) => {
entry.insert(v);
}
Occupied(mut entry) => {
entry.get_mut().merge(v, true)?;
}
}
}
}