Add BETA_CLIPPY_ALLOW variable

To allow clippy lints that exist on beta but not on stable. Signed-off-by: mulhern <[email protected]>
stratis-storage · Sep 3, 2020 · 55066cd · 55066cd
1 parent 9d59140
commit 55066cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -145,7 +145,7 @@ jobs:
       rust: beta
       before_script:
         - rustup component add clippy
-      env: TASK=clippy
+      env: TASK=clippy BETA_CLIPPY_ALLOW="-A clippy::option-if-let-else"
 
     # ALLOWED FAILURES
     # Run audit on Rust stable.  Make it an allowed failure, because:

diff --git a/Makefile b/Makefile
@@ -122,7 +122,7 @@ stratisd.8.gz: stratisd.8
 	gzip --stdout docs/stratisd.8 > docs/stratisd.8.gz
 
 clippy:
-	cargo clippy --all-targets --all-features -- ${DENY} ${CLIPPY_DENY}
+	cargo clippy --all-targets --all-features -- ${DENY} ${CLIPPY_DENY} ${BETA_CLIPPY_ALLOW}
 
 .PHONY:
 	audit
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ stratisd.8.gz: stratisd.8 @@
     	gzip --stdout docs/stratisd.8 > docs/stratisd.8.gz
     clippy:
-    	cargo clippy --all-targets --all-features -- ${DENY} ${CLIPPY_DENY}
+    	cargo clippy --all-targets --all-features -- ${DENY} ${CLIPPY_DENY} ${BETA_CLIPPY_ALLOW}
     .PHONY:
     	audit
@@ Expand Down @@