dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add helper function to pop an element from a HashSet

This commit is contained in:
bjorn3 2018-08-13 17:22:24 +02:00
parent 4615359e86
commit d331758f6d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/constant.rs
View File

@ -150,16 +150,7 @@ fn define_all_allocs<'a, 'tcx: 'a, B: Backend + 'a> (
) {
let memory = Memory::<CompileTimeEvaluator>::new(tcx.at(DUMMY_SP), ());
loop {
let alloc_id = {
if let Some(alloc_id) = cx.todo_allocs.iter().next().map(|alloc_id| *alloc_id) {
cx.todo_allocs.remove(&alloc_id);
alloc_id
} else {
break;
}
};
while let Some(alloc_id) = pop_set(&mut cx.todo_allocs) {
let data_id = define_global_for_alloc_id(module, cx, alloc_id);
println!("alloc_id {} data_id {}", alloc_id, data_id);
if cx.done.contains(&data_id) {
@ -197,3 +188,12 @@ fn define_all_allocs<'a, 'tcx: 'a, B: Backend + 'a> (
assert!(cx.todo_allocs.is_empty(), "{:?}", cx.todo_allocs);
}
fn pop_set<T: Copy + Eq + ::std::hash::Hash>(set: &mut HashSet<T>) -> Option<T> {
if let Some(elem) = set.iter().next().map(|elem| *elem) {
set.remove(&elem);
Some(elem)
} else {
None
}
}