This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12180

hghave: update rustfmt criterion
ClosedPublic

Authored by Alphare on Feb 14 2022, 1:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG090346b095fb: hghave: update rustfmt criterion
Summary

In 9ebc10ad4a04 I updated rustfmt without touching hghave, which means
that the CI has been skipping the format test ever since. Thankfully, only
one offending line exists in the code that's been introduced since.

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

Alphare created this revision.Feb 14 2022, 1:13 PM
Alphare added a commit: rHG090346b095fb: hghave: update rustfmt criterion.Feb 15 2022, 10:17 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG090346b095fb: hghave: update rustfmt criterion (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (4 lines)
Mtests/test-check-rust-format.t (2 lines)

Diff 32212

tests/hghave.py

@check('pytype', 'the pytype type checker') @check('pytype', 'the pytype type checker')
def has_pytype(): def has_pytype():
pytypecmd = 'pytype --version' pytypecmd = 'pytype --version'
version = matchoutput(pytypecmd, b'[0-9a-b.]+') version = matchoutput(pytypecmd, b'[0-9a-b.]+')
sv = distutils.version.StrictVersion sv = distutils.version.StrictVersion
return version and sv(_bytes2sys(version.group(0))) >= sv('2019.10.17') return version and sv(_bytes2sys(version.group(0))) >= sv('2019.10.17')
@check("rustfmt", "rustfmt tool at version nightly-2020-10-04") @check("rustfmt", "rustfmt tool at version nightly-2021-11-02")
def has_rustfmt(): def has_rustfmt():
# We use Nightly's rustfmt due to current unstable config options. # We use Nightly's rustfmt due to current unstable config options.
return matchoutput( return matchoutput(
'`rustup which --toolchain nightly-2020-10-04 rustfmt` --version', '`rustup which --toolchain nightly-2021-11-02 rustfmt` --version',
b'rustfmt', b'rustfmt',
) )
@check("cargo", "cargo tool") @check("cargo", "cargo tool")
def has_cargo(): def has_cargo():
return matchoutput('`rustup which cargo` --version', b'cargo') return matchoutput('`rustup which cargo` --version', b'cargo')

tests/test-check-rust-format.t

#require rustfmt test-repo #require rustfmt test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
Warning: Keep this in sync with hghave.py
$ RUSTFMT=$(rustup which --toolchain nightly-2021-11-02 rustfmt) $ RUSTFMT=$(rustup which --toolchain nightly-2021-11-02 rustfmt)
$ for f in `testrepohg files 'glob:**/*.rs'` ; do $ for f in `testrepohg files 'glob:**/*.rs'` ; do
> $RUSTFMT --check --edition=2018 --unstable-features --color=never $f > $RUSTFMT --check --edition=2018 --unstable-features --color=never $f
> done > done