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

Merge pull request #2910 from RustPython/coolreader18/pop_back-3

Browse Source 
Further clarify pop_back using iterator adaptors
This commit is contained in:
Jeong YunWon
2021-08-19 14:12:02 +09:00
committed by GitHub
parent 5ad023535f 79794019c7
commit 06c4127f47
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vm/src/dictdatatype.rs
View File

@@ -600,22 +600,15 @@ 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)?;
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(entry).unwrap();
let mut inner = &mut *self.write();
let (entry_idx, entry) = inner.entries[..inner.next_new_entry_idx]
.iter_mut()
.enumerate()
.rev()
.find_map(|(i, entry)| entry.take().map(|e| (i, e)))?;
inner.used -= 1;
inner.indices[entry.index] = IndexEntry::DUMMY;
inner.next_new_entry_idx = idx;
inner.next_new_entry_idx = entry_idx;
Some((entry.key, entry.value))
}