Merge pull request #3478 from dtolnay/setlen

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

diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index ac0d2f1614ba189ccdeb7ae1ac168cc6b42a8e69..75decab940eb421b700dfc57b48cff9b63025ba4 100755 (executable)
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -1,3 +1,13 @@
+# Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
 set -x
 rm ~/.cargo/bin/cargo-clippy
 cargo install --force --path .
@@ -9,7 +19,7 @@ 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"
   if [[ $? != 0 ]]; then
@@ -18,9 +28,6 @@ function check() {
 }
 
 case ${INTEGRATION} in
-  rust-lang/cargo)
-    check
-    ;;
   *)
     check
     ;;