D12180: hghave: update rustfmt criterion

Submitter	phabricator
Date	Feb. 14, 2022, 6:14 p.m.
Message ID	<differential-rev-PHID-DREV-rqtpmlgqp3rydnbij6ck-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/50515/
State	New
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Mon, 14 Feb 2022 18:14:17 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: =?utf-8?Q?Alphare_=28Rapha=C3=ABl_Gom=C3=A8s=29?= <phabricator@mercurial-scm.org> Subject: D12180: hghave: update rustfmt criterion Message-ID: <differential-rev-PHID-DREV-rqtpmlgqp3rydnbij6ck-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-rqtpmlgqp3rydnbij6ck Thread-Index: ODA0OWQ0NTJiYjlkOWVkNjNmY2ExZGFlOTJj MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: =?utf-8?Q?Alphare_=28Rapha=C3=ABl_Gom=C3=A8s=29?= <phabricator+D12180+public+cd95f14d9351092f@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Feb. 14, 2022, 6:14 p.m.

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  In 9ebc10ad4a04 <https://phab.mercurial-scm.org/rHG9ebc10ad4a0483c182511ec23cd236e169c74770> 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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D12180

AFFECTED FILES
  tests/hghave.py
  tests/test-check-rust-format.t

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-check-rust-format.t b/tests/test-check-rust-format.t
--- a/tests/test-check-rust-format.t
+++ b/tests/test-check-rust-format.t
@@ -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
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -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',
     )

Patchwork D12180: hghave: update rustfmt criterion

Comments

Patch