From bd66cbb806ee2a4d288d2e22626dff39ee9cc336 Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Mon, 23 Jul 2018 14:12:35 +0100
Subject: [PATCH] Remove obsolete tests in tidy

These have been replaced by more reliable checks in the compiler itself.
---
 src/tools/tidy/src/features.rs | 35 +++-------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index f68ba0b095b..1dc36221bd2 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -50,34 +50,6 @@ pub struct Feature {
     pub tracking_issue: Option<u32>,
 }
 
-impl Feature {
-    fn check_match(&self, other: &Feature)-> Result<(), Vec<&'static str>> {
-        let mut mismatches = Vec::new();
-        if self.level != other.level {
-            mismatches.push("stability level");
-        }
-        if self.level == Status::Stable || other.level == Status::Stable {
-            // As long as a feature is unstable, the since field tracks
-            // when the given part of the feature has been implemented.
-            // Mismatches are tolerable as features evolve and functionality
-            // gets added.
-            // Once a feature is stable, the since field tracks the first version
-            // it was part of the stable distribution, and mismatches are disallowed.
-            if self.since != other.since {
-                mismatches.push("since");
-            }
-        }
-        if self.tracking_issue != other.tracking_issue {
-            mismatches.push("tracking issue");
-        }
-        if mismatches.is_empty() {
-            Ok(())
-        } else {
-            Err(mismatches)
-        }
-    }
-}
-
 pub type Features = HashMap<String, Feature>;
 
 pub fn check(path: &Path, bad: &mut bool, quiet: bool) {
@@ -310,13 +282,12 @@ fn get_and_check_lib_features(base_src_path: &Path,
                 Ok((name, f)) => {
                     let mut check_features = |f: &Feature, list: &Features, display: &str| {
                         if let Some(ref s) = list.get(name) {
-                            if let Err(m) = (&f).check_match(s) {
+                            if f.tracking_issue != s.tracking_issue {
                                 tidy_error!(bad,
-                                            "{}:{}: mismatches to {} in: {:?}",
+                                            "{}:{}: mismatches the `issue` in {}",
                                             file.display(),
                                             line,
-                                            display,
-                                            &m);
+                                            display);
                             }
                         }
                     };
-- 
2.44.0