bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[std::vec] Rename .pop_opt() to .pop(), drop the old .pop() behavior

Browse source
This commit is contained in:
Simon Sapin 2013-12-23 16:20:52 +01:00
parent aa66b91767
commit bada25e425
43 changed files with 128 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustdoc/html/render.rs
View file

@ -635,8 +635,8 @@ impl DocFolder for Cache {
i => i,
};
if pushed { self.stack.pop(); }
if parent_pushed { self.parent_stack.pop(); }
if pushed { self.stack.pop().unwrap(); }
if parent_pushed { self.parent_stack.pop().unwrap(); }
self.privmod = orig_privmod;
return ret;
}
@ -673,7 +673,7 @@ impl Context {
self.dst = prev;
let len = self.root_path.len();
self.root_path.truncate(len - 3);
self.current.pop();
self.current.pop().unwrap();
return ret;
}
@ -693,11 +693,13 @@ impl Context {
local_data::set(cache_key, Arc::new(cache));
let mut work = ~[(self, item)];
while work.len() > 0 {
let (mut cx, item) = work.pop();
cx.item(item, |cx, item| {
work.push((cx.clone(), item));
})
loop {
match work.pop() {
Some((mut cx, item)) => cx.item(item, |cx, item| {
work.push((cx.clone(), item));
}),
None => break,
}
}
}