Auto merge of #4104 - Manishearth:beta-backports, r=flip1995

[rust.git] / ci / integration-tests.sh

diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index ac0d2f1614ba189ccdeb7ae1ac168cc6b42a8e69..1259c5e1d37892f8afdca72ade984611225fcd0e 100755 (executable)
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -9,18 +9,15 @@ cd checkout
 
 function check() {
 # run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
-  RUST_BACKTRACE=full cargo clippy --all-targets --all-features -- --cap-lints warn -W clippy_pedantic -W clippy_nursery  &> clippy_output
+  RUST_BACKTRACE=full cargo clippy --all-targets --all-features -- --cap-lints warn -W clippy::pedantic -W clippy::nursery  &> clippy_output
   cat clippy_output
-  ! cat clippy_output | grep -q "internal compiler error\|query stack during panic"
+  ! cat clippy_output | grep -q "internal compiler error\|query stack during panic\|E0463"
   if [[ $? != 0 ]]; then
     return 1
   fi
 }
 
 case ${INTEGRATION} in
-  rust-lang/cargo)
-    check
-    ;;
   *)
     check
     ;;