Mercurial > hg
changeset 48742:090346b095fb stable
hghave: update rustfmt criterion
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.
Differential Revision: https://phab.mercurial-scm.org/D12180
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Mon, 14 Feb 2022 19:03:22 +0100 |
| parents | 46d12f7762e4 |
| children | a1538c05d855 |
| files | tests/hghave.py tests/test-check-rust-format.t |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/hghave.py Fri Feb 11 23:43:17 2022 +0100 +++ b/tests/hghave.py Mon Feb 14 19:03:22 2022 +0100 @@ -1121,11 +1121,11 @@ 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(): # We use Nightly's rustfmt due to current unstable config options. return matchoutput( - '`rustup which --toolchain nightly-2020-10-04 rustfmt` --version', + '`rustup which --toolchain nightly-2021-11-02 rustfmt` --version', b'rustfmt', )
--- a/tests/test-check-rust-format.t Fri Feb 11 23:43:17 2022 +0100 +++ b/tests/test-check-rust-format.t Mon Feb 14 19:03:22 2022 +0100 @@ -3,6 +3,8 @@ $ . "$TESTDIR/helpers-testrepo.sh" $ cd "$TESTDIR"/.. + +Warning: Keep this in sync with hghave.py $ RUSTFMT=$(rustup which --toolchain nightly-2021-11-02 rustfmt) $ for f in `testrepohg files 'glob:**/*.rs'` ; do > $RUSTFMT --check --edition=2018 --unstable-features --color=never $f