From 33f797aa38e3a62d050776473a7fdf1d1dc14a4e Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Wed, 1 May 2019 11:31:13 +0700
Subject: Add clippy to CI

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 42c4136..9aa5d7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,9 @@ matrix:
         - BIN_NAME=miniserve
         - PROPER_NAME=miniserve-osx-x86_64
       os: osx
+    - rust: nightly
+      env:
+        - CLIPPY=true
 
 before_install:
   - rustup self update
@@ -47,10 +50,12 @@ before_install:
 install:
   # On Apple, the default target is already the right one.
   - if [[ -n $TARGET && $TARGET != "x86_64-apple-darwin" ]]; then rustup target add $TARGET; fi
+  - if [[ -n $CLIPPY ]]; then rustup component add clippy; fi
 
 script:
   # If this is a normal, non-deployment build...
-  - if [[ -z $TARGET ]]; then cargo build --verbose && RUST_BACKTRACE=1 cargo test; fi
+  - if [[ -z $TARGET && -z $CLIPPY ]]; then cargo build --verbose && RUST_BACKTRACE=1 cargo test; fi
+  - if [[ -n $CLIPPY ]]; then cargo clippy -- --deny clippy::all; fi
   - if [[ -n $TARGET ]]; then cargo build --verbose --release --target $TARGET; fi
 
 before_deploy:
-- 
cgit v1.2.3


From 19a2daa5e04ce8c835195fb2441276b26165b1b7 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 2 May 2019 20:30:44 +0700
Subject: Ignore nightly Clippy and enforce stable Clippy

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index b6a4b5e..39845cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ matrix:
   allow_failures:
     - rust: stable
     - rust: beta
+    - rust: nightly
+      env: CLIPPY=true
   include:
     - rust: stable
     - rust: beta
@@ -43,6 +45,9 @@ matrix:
     - rust: nightly
       env:
         - CLIPPY=true
+    - rust: stable
+      env:
+        - CLIPPY=true
 
 before_install:
   - rustup self update
-- 
cgit v1.2.3


From e48a12fc22b5a6c8057036b5c8ded59d17683da0 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 2 May 2019 22:18:39 +0700
Subject: Set env vars to same type (array)

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index fdea92a..e63e51a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,8 @@ matrix:
     - rust: beta
       env: []
     - rust: nightly
-      env: CLIPPY=true
+      env:
+        - CLIPPY=true
   include:
     - rust: stable
       env: []
-- 
cgit v1.2.3


From b6c00c208cb740ab9e29cf043c970824a4326a15 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 2 May 2019 22:39:52 +0700
Subject: Use Clippy on a pinned Nightly version

---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e63e51a..b436fb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,6 @@ matrix:
       env: []
     - rust: beta
       env: []
-    - rust: nightly
-      env:
-        - CLIPPY=true
   include:
     - rust: stable
       env: []
@@ -50,10 +47,7 @@ matrix:
         - BIN_NAME=miniserve
         - PROPER_NAME=miniserve-osx-x86_64
       os: osx
-    - rust: nightly
-      env:
-        - CLIPPY=true
-    - rust: stable
+    - rust: nightly-2019-04-26
       env:
         - CLIPPY=true
 
-- 
cgit v1.2.3