# HG changeset patch # User Georges Racinet # Date 2018-12-04 14:01:13 # Node ID 70976974c14a929acc4f73bf672c57d53fad6810 # Parent 59aed775610a54add37893185ff2226d30161523 rust: rename local variables in AncestorsIterator::next It was confusing to have p1 and parents.1 ; (p1, p2) is clearer. Differential Revision: https://phab.mercurial-scm.org/D5365 diff --git a/rust/hg-core/src/ancestors.rs b/rust/hg-core/src/ancestors.rs --- a/rust/hg-core/src/ancestors.rs +++ b/rust/hg-core/src/ancestors.rs @@ -126,11 +126,10 @@ impl Iterator for AncestorsIte } Some(c) => *c, }; - let parents = self + let (p1, p2) = self .graph .parents(current) .unwrap_or((NULL_REVISION, NULL_REVISION)); - let p1 = parents.0; if p1 < self.stoprev || self.seen.contains(&p1) { self.visit.pop(); } else { @@ -138,7 +137,7 @@ impl Iterator for AncestorsIte self.seen.insert(p1); }; - self.conditionally_push_rev(parents.1); + self.conditionally_push_rev(p2); Some(current) } }