Auto merge of #8372 - tamaroning:unwrap_used, r=llogiq

[rust.git] / tests / versioncheck.rs

diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs
index aadd2c1fb7fdb0c5ab4fcaaa050f2ad46af23dd1..77102b8cac0c977e9621dc9bcc1bf1c6bcb5c11d 100644 (file)
--- a/tests/versioncheck.rs
+++ b/tests/versioncheck.rs
@@ -1,8 +1,17 @@
+#![cfg_attr(feature = "deny-warnings", deny(warnings))]
+#![warn(rust_2018_idioms, unused_lifetimes)]
 #![allow(clippy::single_match_else)]
+
 use rustc_tools_util::VersionInfo;
 
 #[test]
 fn check_that_clippy_lints_and_clippy_utils_have_the_same_version_as_clippy() {
+    // do not run this test inside the upstream rustc repo:
+    // https://github.com/rust-lang/rust-clippy/issues/6683
+    if option_env!("RUSTC_TEST_SUITE").is_some() {
+        return;
+    }
+
     let clippy_meta = cargo_metadata::MetadataCommand::new()
         .no_deps()
         .exec()