Merge branch 'master' into issue-2879

[rust.git] / util / update_lints.py

diff --git a/util/update_lints.py b/util/update_lints.py
index 70d49f940eebc3516b592957258f4bfd850ec300..ea7b992abb71c7de6759e14e739299ee992f9e04 100755 (executable)
--- a/util/update_lints.py
+++ b/util/update_lints.py
@@ -107,7 +107,7 @@ def replace_region(fn, region_start, region_end, callback,
             new_lines.append(line)
 
     if not found:
-        print "regex " + region_start + " not found"
+        print("regex " + region_start + " not found")
 
     # write back to file
     if write_back:
@@ -218,16 +218,16 @@ def main(print_only=False, check=False):
         lambda: gen_mods(all_lints),
         replace_start=False, write_back=not check)
 
-    # same for "clippy_*" lint collections
+    # same for "clippy::*" lint collections
     changed |= replace_region(
-        'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy"', r'\]\);',
+        'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy::all"', r'\]\);',
         lambda: gen_group(clippy_lint_list),
         replace_start=False, write_back=not check)
 
     for key, value in clippy_lints.iteritems():
-        # same for "clippy_*" lint collections
+        # same for "clippy::*" lint collections
         changed |= replace_region(
-            'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy_' + key + r'"', r'\]\);',
+            'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy::' + key + r'"', r'\]\);',
             lambda: gen_group(value),
             replace_start=False, write_back=not check)