Patchwork D5547: rust-cpython: consistency in use of hg-core constructs

login
register
mail settings
Submitter phabricator
Date Jan. 11, 2019, 2:16 p.m.
Message ID <fb7b485914faac07ec015aed846a733a@localhost.localdomain>
Download mbox | patch
Permalink /patch/37669/
State Not Applicable
Headers show

Comments

phabricator - Jan. 11, 2019, 2:16 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5ac61ca58c3f: rust-cpython: consistency in use of hg-core constructs (authored by gracinet, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5547?vs=13125&id=13171

REVISION DETAIL
  https://phab.mercurial-scm.org/D5547

AFFECTED FILES
  rust/hg-cpython/src/ancestors.rs

CHANGE DETAILS




To: gracinet, #hg-reviewers
Cc: durin42, kevincox, mercurial-devel

Patch

diff --git a/rust/hg-cpython/src/ancestors.rs b/rust/hg-cpython/src/ancestors.rs
--- a/rust/hg-cpython/src/ancestors.rs
+++ b/rust/hg-cpython/src/ancestors.rs
@@ -27,7 +27,6 @@ 
     ObjectProtocol, PyClone, PyDict, PyModule, PyObject, PyResult, Python,
 };
 use exceptions::GraphError;
-use hg;
 use hg::Revision;
 use hg::{AncestorsIterator as CoreIterator, LazyAncestors as CoreLazy};
 use std::cell::RefCell;
@@ -66,9 +65,9 @@ 
     def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
                 inclusive: bool) -> PyResult<AncestorsIterator> {
         let initvec = reviter_to_revvec(py, initrevs)?;
-        let ait = match hg::AncestorsIterator::new(Index::new(py, index)?,
-                                                   initvec, stoprev,
-                                                   inclusive) {
+        let ait = match CoreIterator::new(Index::new(py, index)?,
+                                          initvec, stoprev,
+                                          inclusive) {
             Ok(ait) => ait,
             Err(e) => {
                 return Err(GraphError::pynew(py, e));