From a4f09bdd41689b4b04260b22e0c38478c776efa0 Mon Sep 17 00:00:00 2001
From: Alexandre Franke <alexandre.franke@gmail.com>
Date: Wed, 12 Dec 2018 22:47:09 +0100
Subject: [PATCH] rust: stop depending on nightly for fmt

---
 hooks/pre-commit.hook | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hooks/pre-commit.hook b/hooks/pre-commit.hook
index 30947aa7..f8002b6b 100755
--- a/hooks/pre-commit.hook
+++ b/hooks/pre-commit.hook
@@ -8,16 +8,16 @@ if ! which rustup &> /dev/null; then
     fi
 fi
 
-if ! rustup component list --toolchain nightly|grep rustfmt-preview &> /dev/null; then
-    echo "Installing nightly rustfmt.."
-    rustup component add rustfmt-preview --toolchain nightly
+if ! rustup component list|grep rustfmt &> /dev/null; then
+    echo "Installing rustfmt.."
+    rustup component add rustfmt
 fi
 
 echo "--Checking style--"
-cargo +nightly fmt --all -- --check
+cargo fmt --all -- --check
 if test $? != 0; then
     echo "--Checking style fail--"
-    echo "Please fix the above issues, either manually or by running: cargo +nightly fmt --all"
+    echo "Please fix the above issues, either manually or by running: cargo fmt --all"
 
     exit -1
 else