---

yaml
---
r: 277408
b: refs/heads/try
c: 11f1eb0
h: refs/heads/master

Author: LeoTestard

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: ef1de519ff286a21e220d5839a6a5d468d296773
+refs/heads/try: 11f1eb0c4e2ff7e43052b4b847fb4dffaeea46b7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/tools/tidy/src/features.rs

@@ -136,18 +136,18 @@ fn collect_lang_features(path: &Path) -> Vec<Feature> {
 
     let mut features = Vec::new();
     for line in contents.lines().map(|l| l.trim()) {
-        if !STATUSES.iter().any(|s| line.contains(s) && line.starts_with("(")) {
+        if !STATUSES.iter().any(|s| line.starts_with(&format!("({}", s))) {
             continue
         }
         let mut parts = line.split(",");
-        let name = parts.next().unwrap().replace("\"", "").replace("(", "");
-        let since = parts.next().unwrap().trim().replace("\"", "");
-        let status = match parts.skip(1).next().unwrap() {
-            s if s.contains("Active") => "unstable",
-            s if s.contains("Removed") => "unstable",
-            s if s.contains("Accepted") => "stable",
+        let status = match &parts.next().unwrap().trim().replace("(", "")[..] {
+            "active"   => "unstable",
+            "removed"  => "unstable",
+            "accepted" => "stable",
             s => panic!("unknown status: {}", s),
         };
+        let name = parts.next().unwrap().trim().to_owned();
+        let since = parts.next().unwrap().trim().replace("\"", "");
 
         features.push(Feature {
             name: name,