This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5548

rust-cpython: style consistency leftovers
ClosedPublic

Authored by gracinet on Jan 10 2019, 4:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1b4b94bac8a0: rust-cpython: style consistency leftovers
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.Jan 10 2019, 4:55 AM
Closed by commit rHG1b4b94bac8a0: rust-cpython: style consistency leftovers (authored by gracinet). · Explain WhyJan 11 2019, 9:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/ancestors.rs (19 lines)

Diff 13172

rust/hg-cpython/src/ancestors.rs

/// expect iterables over `Revision`, not over some `Result<Revision, PyErr>` /// expect iterables over `Revision`, not over some `Result<Revision, PyErr>`
fn reviter_to_revvec(py: Python, revs: PyObject) -> PyResult<Vec<Revision>> { fn reviter_to_revvec(py: Python, revs: PyObject) -> PyResult<Vec<Revision>> {
revs.iter(py)? revs.iter(py)?
.map(|r| r.and_then(|o| o.extract::<Revision>(py))) .map(|r| r.and_then(|o| o.extract::<Revision>(py)))
.collect() .collect()
} }
py_class!(pub class AncestorsIterator |py| { py_class!(pub class AncestorsIterator |py| {
// TODO RW lock ?
data inner: RefCell<Box<CoreIterator<Index>>>; data inner: RefCell<Box<CoreIterator<Index>>>;
def __next__(&self) -> PyResult<Option<Revision>> { def __next__(&self) -> PyResult<Option<Revision>> {
match self.inner(py).borrow_mut().next() { match self.inner(py).borrow_mut().next() {
Some(Err(e)) => Err(GraphError::pynew(py, e)), Some(Err(e)) => Err(GraphError::pynew(py, e)),
None => Ok(None), None => Ok(None),
Some(Ok(r)) => Ok(Some(r)), Some(Ok(r)) => Ok(Some(r)),
} }
} }
def __contains__(&self, rev: Revision) -> PyResult<bool> { 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> { def __iter__(&self) -> PyResult<Self> {
Ok(self.clone_ref(py)) Ok(self.clone_ref(py))
} }
def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision, def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
inclusive: bool) -> PyResult<AncestorsIterator> { inclusive: bool) -> PyResult<AncestorsIterator> {
let initvec = reviter_to_revvec(py, initrevs)?; let initvec = reviter_to_revvec(py, initrevs)?;
let ait = match CoreIterator::new(Index::new(py, index)?, let ait = CoreIterator::new(
initvec, stoprev, Index::new(py, index)?,
inclusive) { initvec,
Ok(ait) => ait, stoprev,
Err(e) => { inclusive,
return Err(GraphError::pynew(py, e)); )
} .map_err(|e| GraphError::pynew(py, e))?;
};
AncestorsIterator::from_inner(py, ait) AncestorsIterator::from_inner(py, ait)
} }
}); });
impl AncestorsIterator { impl AncestorsIterator {
pub fn from_inner(py: Python, ait: CoreIterator<Index>) -> PyResult<Self> { pub fn from_inner(py: Python, ait: CoreIterator<Index>) -> PyResult<Self> {
Self::create_instance(py, RefCell::new(Box::new(ait))) Self::create_instance(py, RefCell::new(Box::new(ait)))