D5548: rust-cpython: style consistency leftovers

gracinet (Georges Racinet) phabricator at mercurial-scm.org
Thu Jan 10 04:56:06 EST 2019


gracinet created this revision.
Herald added subscribers: mercurial-devel, kevincox, durin42.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  In particular, during review of `LazyAncestors` bindings,
  most `match` statements for error conversion
  have been replaced by higher level methods of `Result` and most
  personal insecurity comments have been removed.
  
  This makes it more systematic.

REPOSITORY
  rHG Mercurial

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

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

CHANGE DETAILS

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
@@ -43,7 +43,6 @@
 }
 
 py_class!(pub class AncestorsIterator |py| {
-    // TODO RW lock ?
     data inner: RefCell<Box<CoreIterator<Index>>>;
 
     def __next__(&self) -> PyResult<Option<Revision>> {
@@ -55,7 +54,8 @@
     }
 
     def __contains__(&self, rev: Revision) -> PyResult<bool> {
-        self.inner(py).borrow_mut().contains(rev).map_err(|e| GraphError::pynew(py, e))
+        self.inner(py).borrow_mut().contains(rev)
+            .map_err(|e| GraphError::pynew(py, e))
     }
 
     def __iter__(&self) -> PyResult<Self> {
@@ -65,14 +65,13 @@
     def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
                 inclusive: bool) -> PyResult<AncestorsIterator> {
         let initvec = reviter_to_revvec(py, initrevs)?;
-        let ait = match CoreIterator::new(Index::new(py, index)?,
-                                          initvec, stoprev,
-                                          inclusive) {
-            Ok(ait) => ait,
-            Err(e) => {
-                return Err(GraphError::pynew(py, e));
-            }
-        };
+        let ait = CoreIterator::new(
+            Index::new(py, index)?,
+            initvec,
+            stoprev,
+            inclusive,
+        )
+        .map_err(|e| GraphError::pynew(py, e))?;
         AncestorsIterator::from_inner(py, ait)
     }
 



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


More information about the Mercurial-devel mailing list