From a6dd9b96068800fd548a72b3aa7ac4712d1d0c49 Mon Sep 17 00:00:00 2001
From: flip1995 <philipp.krones@embecosm.com>
Date: Thu, 25 Feb 2021 11:25:45 +0100
Subject: [PATCH] Fix Clippy build and test

---
 src/tools/clippy/Cargo.toml            | 3 ---
 src/tools/clippy/tests/versioncheck.rs | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
index 1d6bf1ea0eb96..ea32a8edd1ffb 100644
--- a/src/tools/clippy/Cargo.toml
+++ b/src/tools/clippy/Cargo.toml
@@ -18,9 +18,6 @@ build = "build.rs"
 edition = "2018"
 publish = false
 
-[workspace]
-exclude = ["clippy_dev", "mini-macro", "target/lintcheck/crates"]
-
 [[bin]]
 name = "cargo-clippy"
 test = false
diff --git a/src/tools/clippy/tests/versioncheck.rs b/src/tools/clippy/tests/versioncheck.rs
index 1c954c57a8549..922a8207cea86 100644
--- a/src/tools/clippy/tests/versioncheck.rs
+++ b/src/tools/clippy/tests/versioncheck.rs
@@ -3,6 +3,12 @@ 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()