changeset 46002:d42809b6b10f

rust-format: pin the formatted to a specific nightly version Version 1.50 change the way rust-format behave. We pin the version for now, we can figure out something better later.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 23 Nov 2020 14:33:58 +0100
parents f9f8d8aa9a92
children c6da62004c0f
files tests/hghave.py tests/test-check-rust-format.t
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hghave.py	Fri Nov 20 11:22:28 2020 +0100
+++ b/tests/hghave.py	Mon Nov 23 14:33:58 2020 +0100
@@ -1058,11 +1058,12 @@
     return version and sv(_bytes2sys(version.group(0))) >= sv('2019.10.17')
 
 
-@check("rustfmt", "rustfmt tool")
+@check("rustfmt", "rustfmt tool at version nightly-2020-10-04")
 def has_rustfmt():
     # We use Nightly's rustfmt due to current unstable config options.
     return matchoutput(
-        '`rustup which --toolchain nightly rustfmt` --version', b'rustfmt'
+        '`rustup which --toolchain nightly-2020-10-04 rustfmt` --version',
+        b'rustfmt',
     )
 
 
--- a/tests/test-check-rust-format.t	Fri Nov 20 11:22:28 2020 +0100
+++ b/tests/test-check-rust-format.t	Mon Nov 23 14:33:58 2020 +0100
@@ -3,7 +3,7 @@
   $ . "$TESTDIR/helpers-testrepo.sh"
 
   $ cd "$TESTDIR"/..
-  $ RUSTFMT=$(rustup which --toolchain nightly rustfmt)
+  $ RUSTFMT=$(rustup which --toolchain nightly-2020-10-04 rustfmt)
   $ for f in `testrepohg files 'glob:**/*.rs'` ; do
   >   $RUSTFMT --check --edition=2018 --unstable-features --color=never $f
   > done