This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7813

revlog: run rustfmt nightly
ClosedPublic

Authored by durin42 on Jan 8 2020, 2:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG451d22174b5f: revlog: run rustfmt nightly
rHG019fea5edf0c: revlog: run rustfmt nightly
rHG625691953552: revlog: run rustfmt nightly
Summary

I'm a little nervous about folding this back (might be nightly rustfmt
mismatches?) so I want someone to review this.

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

durin42 created this revision.Jan 8 2020, 2:38 PM
gracinet added a subscriber: gracinet.Jan 10 2020, 8:41 AM

For the record, I have the exact same changes with this:

$ rustfmt +nightly --version    
rustfmt 1.4.11-nightly (1838235 2019-12-03)

LGTM to fold

pulkit accepted this revision.Jan 14 2020, 9:52 AM
This revision is now accepted and ready to land.Jan 14 2020, 9:52 AM
durin42 added a commit: rHG625691953552: revlog: run rustfmt nightly.Jan 14 2020, 11:13 AM
Closed by commit rHG625691953552: revlog: run rustfmt nightly (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 19211

rust/hg-cpython/src/revlog.rs

// revlog.rs // revlog.rs
// //
// Copyright 2019 Georges Racinet <georges.racinet@octobus.net> // Copyright 2019 Georges Racinet <georges.racinet@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use crate::cindex; use crate::cindex;
use cpython::{ use cpython::{
ObjectProtocol, PyClone, PyDict, PyModule, PyObject, PyResult, PyTuple, Python, PythonObject, ObjectProtocol, PyClone, PyDict, PyModule, PyObject, PyResult, PyTuple,
ToPyObject, Python, PythonObject, ToPyObject,
}; };
use hg::Revision; use hg::Revision;
use std::cell::RefCell; use std::cell::RefCell;
/// Return a Struct implementing the Graph trait /// Return a Struct implementing the Graph trait
pub(crate) fn pyindex_to_graph(py: Python, index: PyObject) -> PyResult<cindex::Index> { pub(crate) fn pyindex_to_graph(
py: Python,
index: PyObject,
) -> PyResult<cindex::Index> {
match index.extract::<MixedIndex>(py) { match index.extract::<MixedIndex>(py) {
Ok(midx) => Ok(midx.clone_cindex(py)), Ok(midx) => Ok(midx.clone_cindex(py)),
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>;