This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10960

rust-dirstatemap: expand the wrapping code a bit
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:50 PM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf6f25ab6bfc8: rust-dirstatemap: expand the wrapping code a bit
Summary

This is easier to read.

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

marmoute created this revision.Jul 4 2021, 5:50 PM
SimonSapin accepted this revision.Jul 5 2021, 12:29 AM
SimonSapin added a subscriber: SimonSapin.
SimonSapin added inline comments.
rust/hg-cpython/src/dirstate/dirstate_map.rs
130–135

No need to go back for this, but there’s syntactic sugar in struct literals when a field’s value is set to that of a local variable of the same name:

let entry = DirstateEntry {
    state,
    mode,
    size,
    mtime,
};
pulkit accepted this revision.Jul 6 2021, 12:32 PM
This revision is now accepted and ready to land.Jul 6 2021, 12:32 PM
baymax updated this revision to Diff 28862.Jul 6 2021, 2:08 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGf6f25ab6bfc8: rust-dirstatemap: expand the wrapping code a bit.Jul 6 2021, 3:09 PM
Closed by commit rHGf6f25ab6bfc8: rust-dirstatemap: expand the wrapping code a bit (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28899

rust/hg-cpython/src/dirstate/dirstate_map.rs

&self, &self,
f: PyObject, f: PyObject,
oldstate: PyObject, oldstate: PyObject,
state: PyObject, state: PyObject,
mode: PyObject, mode: PyObject,
size: PyObject, size: PyObject,
mtime: PyObject mtime: PyObject
) -> PyResult<PyObject> { ) -> PyResult<PyObject> {
self.inner(py).borrow_mut().add_file( let f = f.extract::<PyBytes>(py)?;
HgPath::new(f.extract::<PyBytes>(py)?.data(py)), let filename = HgPath::new(f.data(py));
oldstate.extract::<PyBytes>(py)?.data(py)[0] let oldstate = oldstate.extract::<PyBytes>(py)?.data(py)[0]
.try_into() .try_into()
.map_err(|e: HgError| { .map_err(|e: HgError| {
PyErr::new::<exc::ValueError, _>(py, e.to_string()) PyErr::new::<exc::ValueError, _>(py, e.to_string())
})?, })?;
DirstateEntry { let state = state.extract::<PyBytes>(py)?.data(py)[0]
state: state.extract::<PyBytes>(py)?.data(py)[0]
.try_into() .try_into()
.map_err(|e: HgError| { .map_err(|e: HgError| {
PyErr::new::<exc::ValueError, _>(py, e.to_string()) PyErr::new::<exc::ValueError, _>(py, e.to_string())
})?, })?;
mode: mode.extract(py)?, let mode = mode.extract(py)?;
size: size.extract(py)?, let size = size.extract(py)?;
mtime: mtime.extract(py)?, let mtime = mtime.extract(py)?;
}, let entry = DirstateEntry {
state: state,
mode: mode,
size: size,
mtime: mtime,
};
SimonSapinUnsubmitted
Not Done

No need to go back for this, but there’s syntactic sugar in struct literals when a field’s value is set to that of a local variable of the same name:

let entry = DirstateEntry {
    state,
    mode,
    size,
    mtime,
};
SimonSapin: No need to go back for this, but there’s syntactic sugar in struct literals when a field’s…
self.inner(py).borrow_mut().add_file(
filename,
oldstate,
entry,
).and(Ok(py.None())).or_else(|e: DirstateError| { ).and(Ok(py.None())).or_else(|e: DirstateError| {
Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())) Err(PyErr::new::<exc::ValueError, _>(py, e.to_string()))
}) })
} }
def removefile( def removefile(
&self, &self,
f: PyObject, f: PyObject,