From ff157ae1f442d574317cd4d8cd6a6eaf27c8fbc4 Mon Sep 17 00:00:00 2001
From: "Samuel E. Moelius III" <sam@moeli.us>
Date: Wed, 17 Feb 2021 12:30:48 -0500
Subject: [PATCH] Improve tests

---
 clippy_utils/Cargo.toml |  4 ++--
 tests/versioncheck.rs   | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/clippy_utils/Cargo.toml b/clippy_utils/Cargo.toml
index cfa0661d87a..d99dbbd7aa3 100644
--- a/clippy_utils/Cargo.toml
+++ b/clippy_utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "clippy_utils"
-version = "0.1.0"
-authors = ["The Rust Project Developers"]
+version = "0.1.51"
+authors = ["The Rust Clippy Developers"]
 edition = "2018"
 
 [dependencies]
diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs
index bc5ed0816cc..aadd2c1fb7f 100644
--- a/tests/versioncheck.rs
+++ b/tests/versioncheck.rs
@@ -2,21 +2,24 @@
 use rustc_tools_util::VersionInfo;
 
 #[test]
-fn check_that_clippy_lints_has_the_same_version_as_clippy() {
+fn check_that_clippy_lints_and_clippy_utils_have_the_same_version_as_clippy() {
     let clippy_meta = cargo_metadata::MetadataCommand::new()
         .no_deps()
         .exec()
         .expect("could not obtain cargo metadata");
-    std::env::set_current_dir(std::env::current_dir().unwrap().join("clippy_lints")).unwrap();
-    let clippy_lints_meta = cargo_metadata::MetadataCommand::new()
-        .no_deps()
-        .exec()
-        .expect("could not obtain cargo metadata");
-    assert_eq!(clippy_lints_meta.packages[0].version, clippy_meta.packages[0].version);
-    for package in &clippy_meta.packages[0].dependencies {
-        if package.name == "clippy_lints" {
-            assert!(package.req.matches(&clippy_lints_meta.packages[0].version));
-            return;
+
+    for krate in &["clippy_lints", "clippy_utils"] {
+        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.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.packages[0].version));
+                break;
+            }
         }
     }
 }