mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce some intermediate variables that aid readability.

Browse Source
This commit is contained in:
Nicholas Nethercote 2019-09-25 11:35:01 +10:00
parent 22943ee27c
commit 6fb1f37888
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_data_structures/obligation_forest/mod.rs
View File

@ -300,9 +300,10 @@ impl<O: ForestObligation> ObligationForest<O> {
match self.active_cache.entry(obligation.as_predicate().clone()) { match self.active_cache.entry(obligation.as_predicate().clone()) {
Entry::Occupied(o) => { Entry::Occupied(o) => {
let index = *o.get();
debug!("register_obligation_at({:?}, {:?}) - duplicate of {:?}!", debug!("register_obligation_at({:?}, {:?}) - duplicate of {:?}!",
obligation, parent, o.get()); obligation, parent, index);
let node = &mut self.nodes[*o.get()]; let node = &mut self.nodes[index];
if let Some(parent_index) = parent { if let Some(parent_index) = parent {
// If the node is already in `active_cache`, it has already // If the node is already in `active_cache`, it has already
// had its chance to be marked with a parent. So if it's // had its chance to be marked with a parent. So if it's
@ -337,7 +338,8 @@ impl<O: ForestObligation> ObligationForest<O> {
if already_failed { if already_failed {
Err(()) Err(())
} else { } else {
v.insert(self.nodes.len()); let new_index = self.nodes.len();
v.insert(new_index);
self.nodes.push(Node::new(parent, obligation, obligation_tree_id)); self.nodes.push(Node::new(parent, obligation, obligation_tree_id));
Ok(()) Ok(())
} }