This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8153

rust-index: moved constructor in separate impl block
ClosedPublic

Authored by Alphare on Feb 26 2020, 12:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG887d0f921b34: rust-index: moved constructor in separate impl block
Summary

with the upcoming addition of the nodemap logic, it's going to become
more complicated.

Being in the separate impl block has the advantage to be subject to rustfmt,
whereas code inside macro calls isn't.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Feb 26 2020, 12:36 PM
Alphare updated this revision to Diff 20652.Mar 10 2020, 6:51 AM
gracinet added a commit: rHG887d0f921b34: rust-index: moved constructor in separate impl block.Mar 11 2020, 11:42 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG887d0f921b34: rust-index: moved constructor in separate impl block (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/revlog.rs (10 lines)

Diff 20652

rust/hg-cpython/src/revlog.rs

Err(_) => cindex::Index::new(py, index), Err(_) => cindex::Index::new(py, index),
} }
} }
py_class!(pub class MixedIndex |py| { py_class!(pub class MixedIndex |py| {
data cindex: RefCell<cindex::Index>; data cindex: RefCell<cindex::Index>;
def __new__(_cls, cindex: PyObject) -> PyResult<MixedIndex> { def __new__(_cls, cindex: PyObject) -> PyResult<MixedIndex> {
Self::create_instance(py, RefCell::new( Self::new(py, cindex)
cindex::Index::new(py, cindex)?))
} }
/// Compatibility layer used for Python consumers needing access to the C index /// Compatibility layer used for Python consumers needing access to the C index
/// ///
/// Only use case so far is `scmutil.shortesthexnodeidprefix`, /// Only use case so far is `scmutil.shortesthexnodeidprefix`,
/// that may need to build a custom `nodetree`, based on a specified revset. /// that may need to build a custom `nodetree`, based on a specified revset.
/// With a Rust implementation of the nodemap, we will be able to get rid of /// With a Rust implementation of the nodemap, we will be able to get rid of
/// this, by exposing our own standalone nodemap class, /// this, by exposing our own standalone nodemap class,
} }
} }
} }
}); });
impl MixedIndex { impl MixedIndex {
fn new(py: Python, cindex: PyObject) -> PyResult<MixedIndex> {
Self::create_instance(
py,
RefCell::new(cindex::Index::new(py, cindex)?),
)
}
/// forward a method call to the underlying C index /// forward a method call to the underlying C index
fn call_cindex( fn call_cindex(
&self, &self,
py: Python, py: Python,
name: &str, name: &str,
args: &PyTuple, args: &PyTuple,
kwargs: Option<&PyDict>, kwargs: Option<&PyDict>,
) -> PyResult<PyObject> { ) -> PyResult<PyObject> {