Add run-rustfix to into_iter_on_ref

[rust.git] / util / lintlib.py

diff --git a/util/lintlib.py b/util/lintlib.py
index 00826805e1617b5e80db08168b668f8e1f5b087d..1c49ab770d5e3e8175eecd2530c65d772f092a4d 100644 (file)
--- a/util/lintlib.py
+++ b/util/lintlib.py
@@ -44,7 +44,7 @@ def parse_lints(lints, filepath):
                     last_comment.append(line[3:])
                 elif line.startswith("declare_lint!"):
                     import sys
-                    print "don't use `declare_lint!` in Clippy, use `declare_clippy_lint!` instead"
+                    print("don't use `declare_lint!` in Clippy, use `declare_clippy_lint!` instead")
                     sys.exit(42)
                 elif line.startswith("declare_clippy_lint!"):
                     comment = False
@@ -72,10 +72,13 @@ def parse_lints(lints, filepath):
                             g = group_re.search(line)
                             if g:
                                 group = g.group(1).lower()
-                                level = lint_levels[group]
+                                level = lint_levels.get(group, None)
                                 break
                             line = next(fp)
 
+                    if level is None:
+                        continue
+
                     log.info("found %s with level %s in %s",
                              name, level, filepath)
                     lints.append(Lint(name, level, last_comment, filepath, group))
@@ -103,9 +106,11 @@ def parse_configs(path):
 
 def parse_all(path="clippy_lints/src"):
     lints = []
-    for filename in os.listdir(path):
-        if filename.endswith(".rs"):
-            parse_lints(lints, os.path.join(path, filename))
+    for root, dirs, files in os.walk(path):
+        for fn in files:
+            if fn.endswith('.rs'):
+                parse_lints(lints, os.path.join(root, fn))
+
     log.info("got %s lints", len(lints))
 
     configs = parse_configs(path)