Auto merge of #6802 - camsteffen:dogfood-fix, r=llogiq

Remove workspace and fix dogfood (again)

changelog: none

In response to https://github.com/rust-lang/rust-clippy/pull/6733#issuecomment-785792060

2 files changed, 7 insertions, 6 deletions

diff --git a/tests/dogfood.rs b/tests/dogfood.rs
index 052223d6d6f..8fe48a67beb 100644
--- a/tests/dogfood.rs
+++ b/tests/dogfood.rs
@@ -26,6 +26,7 @@ fn dogfood_clippy() {
         .arg("clippy-preview")
         .arg("--all-targets")
         .arg("--all-features")
+        .args(&["-p", "clippy_lints", "-p", "clippy_utils", "-p", "rustc_tools_util"])
         .arg("--")
         .args(&["-D", "clippy::all"])
         .args(&["-D", "clippy::pedantic"])
diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs
index 1c954c57a85..aadd2c1fb7f 100644
--- a/tests/versioncheck.rs
+++ b/tests/versioncheck.rs
@@ -9,15 +9,15 @@ fn check_that_clippy_lints_and_clippy_utils_have_the_same_version_as_clippy() {
         .expect("could not obtain cargo metadata");
 
     for krate in &["clippy_lints", "clippy_utils"] {
-        let krate_meta = clippy_meta
-            .packages
-            .iter()
-            .find(|package| package.name == *krate)
+        let krate_meta = cargo_metadata::MetadataCommand::new()
+            .current_dir(std::env::current_dir().unwrap().join(krate))
+            .no_deps()
+            .exec()
             .expect("could not obtain cargo metadata");
-        assert_eq!(krate_meta.version, clippy_meta.packages[0].version);
+        assert_eq!(krate_meta.packages[0].version, clippy_meta.packages[0].version);
         for package in &clippy_meta.packages[0].dependencies {
             if package.name == *krate {
-                assert!(package.req.matches(&krate_meta.version));
+                assert!(package.req.matches(&krate_meta.packages[0].version));
                 break;
             }
         }