Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

remove double-get from DictDataType::pop_back

Browse Source
This commit is contained in:
Jeong YunWon
2021-08-19 01:41:22 +09:00
parent e277acc747
commit b58e11f1f4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vm/src/dictdatatype.rs
View File

@@ -602,18 +602,21 @@ impl<T: Clone> Dict<T> {
pub fn pop_back(&self) -> Option<(PyObjectRef, T)> {
let mut inner = self.write();
let mut idx = inner.next_new_entry_idx.checked_sub(1)?;
while inner.entries.get(idx).unwrap().is_none() {
let entry = loop {
if let Some(entry) = inner.entries.get_mut(idx) {
if entry.is_some() {
break entry;
}
}
idx = idx.checked_sub(1)?;
}
};
let entry = std::mem::take(&mut inner.entries[idx]).unwrap();
let removed_key = entry.key;
let removed_item = entry.value;
let entry = std::mem::take(entry).unwrap();
inner.used -= 1;
inner.indices[entry.index] = IndexEntry::DUMMY;
inner.next_new_entry_idx = idx;
Some((removed_key, removed_item))
Some((entry.key, entry.value))
}
pub fn sizeof(&self) -> usize {