From 55066cd8a2121b5bad78c36ee4da64ffb2ca800d Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Thu, 3 Sep 2020 09:56:39 -0400
Subject: [PATCH] Add BETA_CLIPPY_ALLOW variable

To allow clippy lints that exist on beta but not on stable.

Signed-off-by: mulhern <amulhern@redhat.com>
---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea0dbfbe946..835d3df5d17 100644
--- 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
index ce8e43dba05..2881b7a522d 100644
--- 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