Move compile-fail tests that are rejected by the parser to parse-fail

131 files changed, 20 insertions, 12 deletions

diff --git a/src/grammar/testparser.py b/src/grammar/testparser.py
index 16babd4194e..37be41b935f 100755
--- a/src/grammar/testparser.py
+++ b/src/grammar/testparser.py
@@ -35,34 +35,42 @@ for parser in args.parser:
     ok[parser] = 0
     bad[parser] = []
 devnull = open(os.devnull, 'w')
-print "\n"
+print("\n")
 
 for base, dirs, files in os.walk(args.source_dir[0]):
     for f in filter(lambda p: p.endswith('.rs'), files):
         p = os.path.join(base, f)
-        compile_fail = 'compile-fail' in p
-        ignore = any('ignore-test' in line or 'ignore-lexer-test' in line
-                     for line in open(p).readlines())
-        if compile_fail or ignore:
+        parse_fail = 'parse-fail' in p
+        if sys.version_info.major == 3:
+            lines = open(p, encoding='utf-8').readlines()
+        else:
+            lines = open(p).readlines()
+        if any('ignore-test' in line or 'ignore-lexer-test' in line for line in lines):
             continue
         total += 1
         for parser in args.parser:
             if subprocess.call(parser, stdin=open(p), stderr=subprocess.STDOUT, stdout=devnull) == 0:
-                ok[parser] += 1
+                if parse_fail:
+                    bad[parser].append(p)
+                else:
+                    ok[parser] += 1
             else:
-                bad[parser].append(p)
+                if parse_fail:
+                    ok[parser] += 1
+                else:
+                    bad[parser].append(p)
         parser_stats = ', '.join(['{}: {}'.format(parser, ok[parser]) for parser in args.parser])
         sys.stdout.write("\033[K\r total: {}, {}, scanned {}"
                          .format(total, os.path.relpath(parser_stats), os.path.relpath(p)))
 
 devnull.close()
 
-print "\n"
+print("\n")
 
 for parser in args.parser:
     filename = os.path.basename(parser) + '.bad'
-    print("writing {} files that failed to parse with {} to {}".format(len(bad[parser]), parser, filename))
+    print("writing {} files that did not yield the correct result with {} to {}".format(len(bad[parser]), parser, filename))
     with open(filename, "w") as f:
-          for p in bad[parser]:
-              f.write(p)
-              f.write("\n")
+        for p in bad[parser]:
+            f.write(p)
+            f.write("\n")
diff --git a/src/test/compile-fail/array-old-syntax-1.rs b/src/test/parse-fail/array-old-syntax-1.rs
index 71c57fefc2e..71c57fefc2e 100644
--- a/src/test/compile-fail/array-old-syntax-1.rs
+++ b/src/test/parse-fail/array-old-syntax-1.rs
diff --git a/src/test/compile-fail/associated-types-project-from-hrtb-explicit.rs b/src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs
index 917c03fbf4b..917c03fbf4b 100644
--- a/src/test/compile-fail/associated-types-project-from-hrtb-explicit.rs
+++ b/src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs
diff --git a/src/test/compile-fail/attr-bad-meta.rs b/src/test/parse-fail/attr-bad-meta.rs
index dbf2929afe4..dbf2929afe4 100644
--- a/src/test/compile-fail/attr-bad-meta.rs
+++ b/src/test/parse-fail/attr-bad-meta.rs
diff --git a/src/test/compile-fail/bad-match.rs b/src/test/parse-fail/bad-match.rs
index 33043ff5524..33043ff5524 100644
--- a/src/test/compile-fail/bad-match.rs
+++ b/src/test/parse-fail/bad-match.rs
diff --git a/src/test/compile-fail/bad-name.rs b/src/test/parse-fail/bad-name.rs
index b208c6f4244..b208c6f4244 100644
--- a/src/test/compile-fail/bad-name.rs
+++ b/src/test/parse-fail/bad-name.rs
diff --git a/src/test/compile-fail/better-expected.rs b/src/test/parse-fail/better-expected.rs
index e07f4b8e549..e07f4b8e549 100644
--- a/src/test/compile-fail/better-expected.rs
+++ b/src/test/parse-fail/better-expected.rs
diff --git a/src/test/compile-fail/bind-struct-early-modifiers.rs b/src/test/parse-fail/bind-struct-early-modifiers.rs
index c358a21d125..c358a21d125 100644
--- a/src/test/compile-fail/bind-struct-early-modifiers.rs
+++ b/src/test/parse-fail/bind-struct-early-modifiers.rs
diff --git a/src/test/compile-fail/byte-literals.rs b/src/test/parse-fail/byte-literals.rs
index 436078fa762..436078fa762 100644
--- a/src/test/compile-fail/byte-literals.rs
+++ b/src/test/parse-fail/byte-literals.rs
diff --git a/src/test/compile-fail/byte-string-literals.rs b/src/test/parse-fail/byte-string-literals.rs
index ec67cdd77e1..ec67cdd77e1 100644
--- a/src/test/compile-fail/byte-string-literals.rs
+++ b/src/test/parse-fail/byte-string-literals.rs
diff --git a/src/test/compile-fail/circular_modules_hello.rs b/src/test/parse-fail/circular_modules_hello.rs
index 3bf851643f2..3bf851643f2 100644
--- a/src/test/compile-fail/circular_modules_hello.rs
+++ b/src/test/parse-fail/circular_modules_hello.rs
diff --git a/src/test/compile-fail/circular_modules_main.rs b/src/test/parse-fail/circular_modules_main.rs
index ac5ec1236ff..ac5ec1236ff 100644
--- a/src/test/compile-fail/circular_modules_main.rs
+++ b/src/test/parse-fail/circular_modules_main.rs
diff --git a/src/test/compile-fail/class-implements-bad-trait.rs b/src/test/parse-fail/class-implements-bad-trait.rs
index d709ffdc3fc..d709ffdc3fc 100644
--- a/src/test/compile-fail/class-implements-bad-trait.rs
+++ b/src/test/parse-fail/class-implements-bad-trait.rs
diff --git a/src/test/compile-fail/column-offset-1-based.rs b/src/test/parse-fail/column-offset-1-based.rs
index 621b480fe77..621b480fe77 100644
--- a/src/test/compile-fail/column-offset-1-based.rs
+++ b/src/test/parse-fail/column-offset-1-based.rs
diff --git a/src/test/compile-fail/duplicate-visibility.rs b/src/test/parse-fail/duplicate-visibility.rs
index b213730ef75..b213730ef75 100644
--- a/src/test/compile-fail/duplicate-visibility.rs
+++ b/src/test/parse-fail/duplicate-visibility.rs
diff --git a/src/test/compile-fail/empty-impl-semicolon.rs b/src/test/parse-fail/empty-impl-semicolon.rs
index 70c7d42feb5..70c7d42feb5 100644
--- a/src/test/compile-fail/empty-impl-semicolon.rs
+++ b/src/test/parse-fail/empty-impl-semicolon.rs
diff --git a/src/test/compile-fail/extern-expected-fn-or-brace.rs b/src/test/parse-fail/extern-expected-fn-or-brace.rs
index 7d1110cf6df..7d1110cf6df 100644
--- a/src/test/compile-fail/extern-expected-fn-or-brace.rs
+++ b/src/test/parse-fail/extern-expected-fn-or-brace.rs
diff --git a/src/test/compile-fail/extern-foreign-crate.rs b/src/test/parse-fail/extern-foreign-crate.rs
index 24b978b0a21..24b978b0a21 100644
--- a/src/test/compile-fail/extern-foreign-crate.rs
+++ b/src/test/parse-fail/extern-foreign-crate.rs
diff --git a/src/test/compile-fail/extern-no-fn.rs b/src/test/parse-fail/extern-no-fn.rs
index 69e2f3ae60b..69e2f3ae60b 100644
--- a/src/test/compile-fail/extern-no-fn.rs
+++ b/src/test/parse-fail/extern-no-fn.rs
diff --git a/src/test/compile-fail/import-from-path.rs b/src/test/parse-fail/import-from-path.rs
index ce91de7e9d9..ce91de7e9d9 100644
--- a/src/test/compile-fail/import-from-path.rs
+++ b/src/test/parse-fail/import-from-path.rs
diff --git a/src/test/compile-fail/import-from-rename.rs b/src/test/parse-fail/import-from-rename.rs
index ebd897a0611..ebd897a0611 100644
--- a/src/test/compile-fail/import-from-rename.rs
+++ b/src/test/parse-fail/import-from-rename.rs
diff --git a/src/test/compile-fail/import-glob-path.rs b/src/test/parse-fail/import-glob-path.rs
index b6bc53fad94..b6bc53fad94 100644
--- a/src/test/compile-fail/import-glob-path.rs
+++ b/src/test/parse-fail/import-glob-path.rs
diff --git a/src/test/compile-fail/import-glob-rename.rs b/src/test/parse-fail/import-glob-rename.rs
index fb400b6c2bb..fb400b6c2bb 100644
--- a/src/test/compile-fail/import-glob-rename.rs
+++ b/src/test/parse-fail/import-glob-rename.rs
diff --git a/src/test/compile-fail/issue-10392-2.rs b/src/test/parse-fail/issue-10392-2.rs
index b077081c5b0..b077081c5b0 100644
--- a/src/test/compile-fail/issue-10392-2.rs
+++ b/src/test/parse-fail/issue-10392-2.rs
diff --git a/src/test/compile-fail/issue-10392.rs b/src/test/parse-fail/issue-10392.rs
index 3f8d26bfec0..3f8d26bfec0 100644
--- a/src/test/compile-fail/issue-10392.rs
+++ b/src/test/parse-fail/issue-10392.rs
diff --git a/src/test/compile-fail/issue-10636-1.rs b/src/test/parse-fail/issue-10636-1.rs
index bb020d55bdb..bb020d55bdb 100644
--- a/src/test/compile-fail/issue-10636-1.rs
+++ b/src/test/parse-fail/issue-10636-1.rs
diff --git a/src/test/compile-fail/issue-10636-2.rs b/src/test/parse-fail/issue-10636-2.rs
index a92ef248924..a92ef248924 100644
--- a/src/test/compile-fail/issue-10636-2.rs
+++ b/src/test/parse-fail/issue-10636-2.rs
diff --git a/src/test/compile-fail/issue-14303-enum.rs b/src/test/parse-fail/issue-14303-enum.rs
index a26b7fdc425..a26b7fdc425 100644
--- a/src/test/compile-fail/issue-14303-enum.rs
+++ b/src/test/parse-fail/issue-14303-enum.rs
diff --git a/src/test/compile-fail/issue-14303-fn-def.rs b/src/test/parse-fail/issue-14303-fn-def.rs
index aaf95410b8e..aaf95410b8e 100644
--- a/src/test/compile-fail/issue-14303-fn-def.rs
+++ b/src/test/parse-fail/issue-14303-fn-def.rs
diff --git a/src/test/compile-fail/issue-14303-fncall.rs b/src/test/parse-fail/issue-14303-fncall.rs
index a7adaacc0a5..a7adaacc0a5 100644
--- a/src/test/compile-fail/issue-14303-fncall.rs
+++ b/src/test/parse-fail/issue-14303-fncall.rs
diff --git a/src/test/compile-fail/issue-14303-impl.rs b/src/test/parse-fail/issue-14303-impl.rs
index c4a00581274..c4a00581274 100644
--- a/src/test/compile-fail/issue-14303-impl.rs
+++ b/src/test/parse-fail/issue-14303-impl.rs
diff --git a/src/test/compile-fail/issue-14303-path.rs b/src/test/parse-fail/issue-14303-path.rs
index 30cc41c3588..30cc41c3588 100644
--- a/src/test/compile-fail/issue-14303-path.rs
+++ b/src/test/parse-fail/issue-14303-path.rs
diff --git a/src/test/compile-fail/issue-14303-struct.rs b/src/test/parse-fail/issue-14303-struct.rs
index 6edd808d847..6edd808d847 100644
--- a/src/test/compile-fail/issue-14303-struct.rs
+++ b/src/test/parse-fail/issue-14303-struct.rs
diff --git a/src/test/compile-fail/issue-14303-trait.rs b/src/test/parse-fail/issue-14303-trait.rs
index 753acdd75fe..753acdd75fe 100644
--- a/src/test/compile-fail/issue-14303-trait.rs
+++ b/src/test/parse-fail/issue-14303-trait.rs
diff --git a/src/test/compile-fail/issue-15914.rs b/src/test/parse-fail/issue-15914.rs
index 45b3abfddfb..45b3abfddfb 100644
--- a/src/test/compile-fail/issue-15914.rs
+++ b/src/test/parse-fail/issue-15914.rs
diff --git a/src/test/compile-fail/issue-1655.rs b/src/test/parse-fail/issue-1655.rs
index a8704f7545f..a8704f7545f 100644
--- a/src/test/compile-fail/issue-1655.rs
+++ b/src/test/parse-fail/issue-1655.rs
diff --git a/src/test/compile-fail/issue-17904.rs b/src/test/parse-fail/issue-17904.rs
index 96ba712bbae..96ba712bbae 100644
--- a/src/test/compile-fail/issue-17904.rs
+++ b/src/test/parse-fail/issue-17904.rs
diff --git a/src/test/compile-fail/issue-1802-1.rs b/src/test/parse-fail/issue-1802-1.rs
index 8ce99f517c4..8ce99f517c4 100644
--- a/src/test/compile-fail/issue-1802-1.rs
+++ b/src/test/parse-fail/issue-1802-1.rs
diff --git a/src/test/compile-fail/issue-19096.rs b/src/test/parse-fail/issue-19096.rs
index 90d2acbe581..90d2acbe581 100644
--- a/src/test/compile-fail/issue-19096.rs
+++ b/src/test/parse-fail/issue-19096.rs
diff --git a/src/test/compile-fail/issue-19398.rs b/src/test/parse-fail/issue-19398.rs
index 3a6d15e0086..3a6d15e0086 100644
--- a/src/test/compile-fail/issue-19398.rs
+++ b/src/test/parse-fail/issue-19398.rs
diff --git a/src/test/compile-fail/issue-20711-2.rs b/src/test/parse-fail/issue-20711-2.rs
index a6c4570c60f..a6c4570c60f 100644
--- a/src/test/compile-fail/issue-20711-2.rs
+++ b/src/test/parse-fail/issue-20711-2.rs
diff --git a/src/test/compile-fail/issue-20711.rs b/src/test/parse-fail/issue-20711.rs
index 3b329d78237..3b329d78237 100644
--- a/src/test/compile-fail/issue-20711.rs
+++ b/src/test/parse-fail/issue-20711.rs
diff --git a/src/test/compile-fail/issue-21153.rs b/src/test/parse-fail/issue-21153.rs
index e2b6deb0ad9..e2b6deb0ad9 100644
--- a/src/test/compile-fail/issue-21153.rs
+++ b/src/test/parse-fail/issue-21153.rs
diff --git a/src/test/compile-fail/issue-2354-1.rs b/src/test/parse-fail/issue-2354-1.rs
index d37837b9714..d37837b9714 100644
--- a/src/test/compile-fail/issue-2354-1.rs
+++ b/src/test/parse-fail/issue-2354-1.rs
diff --git a/src/test/compile-fail/issue-2354.rs b/src/test/parse-fail/issue-2354.rs
index cc219a6acb5..cc219a6acb5 100644
--- a/src/test/compile-fail/issue-2354.rs
+++ b/src/test/parse-fail/issue-2354.rs
diff --git a/src/test/compile-fail/issue-3036.rs b/src/test/parse-fail/issue-3036.rs
index 16834f49165..16834f49165 100644
--- a/src/test/compile-fail/issue-3036.rs
+++ b/src/test/parse-fail/issue-3036.rs
diff --git a/src/test/compile-fail/issue-5806.rs b/src/test/parse-fail/issue-5806.rs
index 597366a1b35..597366a1b35 100644
--- a/src/test/compile-fail/issue-5806.rs
+++ b/src/test/parse-fail/issue-5806.rs
diff --git a/src/test/compile-fail/issue-6610.rs b/src/test/parse-fail/issue-6610.rs
index 166e91b27ac..166e91b27ac 100644
--- a/src/test/compile-fail/issue-6610.rs
+++ b/src/test/parse-fail/issue-6610.rs
diff --git a/src/test/compile-fail/keyword-abstract.rs b/src/test/parse-fail/keyword-abstract.rs
index 1f1360eac00..1f1360eac00 100644
--- a/src/test/compile-fail/keyword-abstract.rs
+++ b/src/test/parse-fail/keyword-abstract.rs
diff --git a/src/test/compile-fail/keyword-do-as-identifier.rs b/src/test/parse-fail/keyword-do-as-identifier.rs
index 90f73f8a9f4..90f73f8a9f4 100644
--- a/src/test/compile-fail/keyword-do-as-identifier.rs
+++ b/src/test/parse-fail/keyword-do-as-identifier.rs
diff --git a/src/test/compile-fail/keyword-final.rs b/src/test/parse-fail/keyword-final.rs
index 305ef0ef075..305ef0ef075 100644
--- a/src/test/compile-fail/keyword-final.rs
+++ b/src/test/parse-fail/keyword-final.rs
diff --git a/src/test/compile-fail/keyword-mut-as-identifier.rs b/src/test/parse-fail/keyword-mut-as-identifier.rs
index b5d36e57750..b5d36e57750 100644
--- a/src/test/compile-fail/keyword-mut-as-identifier.rs
+++ b/src/test/parse-fail/keyword-mut-as-identifier.rs
diff --git a/src/test/compile-fail/keyword-override.rs b/src/test/parse-fail/keyword-override.rs
index f70e6b92610..f70e6b92610 100644
--- a/src/test/compile-fail/keyword-override.rs
+++ b/src/test/parse-fail/keyword-override.rs
diff --git a/src/test/compile-fail/keyword-priv-as-identifier.rs b/src/test/parse-fail/keyword-priv-as-identifier.rs
index 7cbaeb9d518..7cbaeb9d518 100644
--- a/src/test/compile-fail/keyword-priv-as-identifier.rs
+++ b/src/test/parse-fail/keyword-priv-as-identifier.rs
diff --git a/src/test/compile-fail/keyword-ref-as-identifier.rs b/src/test/parse-fail/keyword-ref-as-identifier.rs
index 72af521f6f1..72af521f6f1 100644
--- a/src/test/compile-fail/keyword-ref-as-identifier.rs
+++ b/src/test/parse-fail/keyword-ref-as-identifier.rs
diff --git a/src/test/compile-fail/keyword-typeof.rs b/src/test/parse-fail/keyword-typeof.rs
index c42875382b9..c42875382b9 100644
--- a/src/test/compile-fail/keyword-typeof.rs
+++ b/src/test/parse-fail/keyword-typeof.rs
diff --git a/src/test/compile-fail/lex-bad-char-literals.rs b/src/test/parse-fail/lex-bad-char-literals.rs
index fbe03e355ee..fbe03e355ee 100644
--- a/src/test/compile-fail/lex-bad-char-literals.rs
+++ b/src/test/parse-fail/lex-bad-char-literals.rs
diff --git a/src/test/compile-fail/lex-bad-token.rs b/src/test/parse-fail/lex-bad-token.rs
index d28d9a20c6e..d28d9a20c6e 100644
--- a/src/test/compile-fail/lex-bad-token.rs
+++ b/src/test/parse-fail/lex-bad-token.rs
diff --git a/src/test/compile-fail/macro-attribute.rs b/src/test/parse-fail/macro-attribute.rs
index 77ea0c9c4f3..77ea0c9c4f3 100644
--- a/src/test/compile-fail/macro-attribute.rs
+++ b/src/test/parse-fail/macro-attribute.rs
diff --git a/src/test/compile-fail/macro-bad-delimiter-ident.rs b/src/test/parse-fail/macro-bad-delimiter-ident.rs
index 75f7b5d4dd8..75f7b5d4dd8 100644
--- a/src/test/compile-fail/macro-bad-delimiter-ident.rs
+++ b/src/test/parse-fail/macro-bad-delimiter-ident.rs
diff --git a/src/test/compile-fail/macro-keyword.rs b/src/test/parse-fail/macro-keyword.rs
index 9d4ec9c176c..9d4ec9c176c 100644
--- a/src/test/compile-fail/macro-keyword.rs
+++ b/src/test/parse-fail/macro-keyword.rs
diff --git a/src/test/compile-fail/macro-mismatched-delim-brace-paren.rs b/src/test/parse-fail/macro-mismatched-delim-brace-paren.rs
index d03698c1573..d03698c1573 100644
--- a/src/test/compile-fail/macro-mismatched-delim-brace-paren.rs
+++ b/src/test/parse-fail/macro-mismatched-delim-brace-paren.rs
diff --git a/src/test/compile-fail/macro-mismatched-delim-paren-brace.rs b/src/test/parse-fail/macro-mismatched-delim-paren-brace.rs
index d80f93d7ad0..d80f93d7ad0 100644
--- a/src/test/compile-fail/macro-mismatched-delim-paren-brace.rs
+++ b/src/test/parse-fail/macro-mismatched-delim-paren-brace.rs
diff --git a/src/test/compile-fail/macros-no-semicolon.rs b/src/test/parse-fail/macros-no-semicolon.rs
index 0e85551e216..0e85551e216 100644
--- a/src/test/compile-fail/macros-no-semicolon.rs
+++ b/src/test/parse-fail/macros-no-semicolon.rs
diff --git a/src/test/compile-fail/match-arrows-block-then-binop.rs b/src/test/parse-fail/match-arrows-block-then-binop.rs
index b6b2313aa09..b6b2313aa09 100644
--- a/src/test/compile-fail/match-arrows-block-then-binop.rs
+++ b/src/test/parse-fail/match-arrows-block-then-binop.rs
diff --git a/src/test/compile-fail/match-vec-invalid.rs b/src/test/parse-fail/match-vec-invalid.rs
index 3e073d34f32..3e073d34f32 100644
--- a/src/test/compile-fail/match-vec-invalid.rs
+++ b/src/test/parse-fail/match-vec-invalid.rs
diff --git a/src/test/compile-fail/mod_file_disambig.rs b/src/test/parse-fail/mod_file_disambig.rs
index 48bd00a3ee0..48bd00a3ee0 100644
--- a/src/test/compile-fail/mod_file_disambig.rs
+++ b/src/test/parse-fail/mod_file_disambig.rs
diff --git a/src/test/compile-fail/mod_file_not_exist.rs b/src/test/parse-fail/mod_file_not_exist.rs
index bbf2152d5b7..bbf2152d5b7 100644
--- a/src/test/compile-fail/mod_file_not_exist.rs
+++ b/src/test/parse-fail/mod_file_not_exist.rs
diff --git a/src/test/compile-fail/mod_file_not_owning.rs b/src/test/parse-fail/mod_file_not_owning.rs
index adbcedd91f2..adbcedd91f2 100644
--- a/src/test/compile-fail/mod_file_not_owning.rs
+++ b/src/test/parse-fail/mod_file_not_owning.rs
diff --git a/src/test/compile-fail/mod_file_with_path_attr.rs b/src/test/parse-fail/mod_file_with_path_attr.rs
index ff330047c4e..ff330047c4e 100644
--- a/src/test/compile-fail/mod_file_with_path_attr.rs
+++ b/src/test/parse-fail/mod_file_with_path_attr.rs
diff --git a/src/test/compile-fail/multiline-comment-line-tracking.rs b/src/test/parse-fail/multiline-comment-line-tracking.rs
index 11abe672745..11abe672745 100644
--- a/src/test/compile-fail/multiline-comment-line-tracking.rs
+++ b/src/test/parse-fail/multiline-comment-line-tracking.rs
diff --git a/src/test/compile-fail/multitrait.rs b/src/test/parse-fail/multitrait.rs
index f182eb8fa5b..f182eb8fa5b 100644
--- a/src/test/compile-fail/multitrait.rs
+++ b/src/test/parse-fail/multitrait.rs
diff --git a/src/test/compile-fail/mut-patterns.rs b/src/test/parse-fail/mut-patterns.rs
index cde05bc1d52..cde05bc1d52 100644
--- a/src/test/compile-fail/mut-patterns.rs
+++ b/src/test/parse-fail/mut-patterns.rs
diff --git a/src/test/compile-fail/new-unicode-escapes-1.rs b/src/test/parse-fail/new-unicode-escapes-1.rs
index f2422830a21..f2422830a21 100644
--- a/src/test/compile-fail/new-unicode-escapes-1.rs
+++ b/src/test/parse-fail/new-unicode-escapes-1.rs
diff --git a/src/test/compile-fail/new-unicode-escapes-2.rs b/src/test/parse-fail/new-unicode-escapes-2.rs
index 5da8674c37e..5da8674c37e 100644
--- a/src/test/compile-fail/new-unicode-escapes-2.rs
+++ b/src/test/parse-fail/new-unicode-escapes-2.rs
diff --git a/src/test/compile-fail/new-unicode-escapes-3.rs b/src/test/parse-fail/new-unicode-escapes-3.rs
index 7c64d02efd7..7c64d02efd7 100644
--- a/src/test/compile-fail/new-unicode-escapes-3.rs
+++ b/src/test/parse-fail/new-unicode-escapes-3.rs
diff --git a/src/test/compile-fail/new-unicode-escapes-4.rs b/src/test/parse-fail/new-unicode-escapes-4.rs
index ffc2b11e0c1..ffc2b11e0c1 100644
--- a/src/test/compile-fail/new-unicode-escapes-4.rs
+++ b/src/test/parse-fail/new-unicode-escapes-4.rs
diff --git a/src/test/compile-fail/not-a-pred.rs b/src/test/parse-fail/not-a-pred.rs
index 782c90a6c26..782c90a6c26 100644
--- a/src/test/compile-fail/not-a-pred.rs
+++ b/src/test/parse-fail/not-a-pred.rs
diff --git a/src/test/compile-fail/omitted-arg-in-item-fn.rs b/src/test/parse-fail/omitted-arg-in-item-fn.rs
index 729b45df8b4..729b45df8b4 100644
--- a/src/test/compile-fail/omitted-arg-in-item-fn.rs
+++ b/src/test/parse-fail/omitted-arg-in-item-fn.rs
diff --git a/src/test/compile-fail/paamayim-nekudotayim.rs b/src/test/parse-fail/paamayim-nekudotayim.rs
index 4d5473faf73..4d5473faf73 100644
--- a/src/test/compile-fail/paamayim-nekudotayim.rs
+++ b/src/test/parse-fail/paamayim-nekudotayim.rs
diff --git a/src/test/compile-fail/parenthesized-box-expr-message.rs b/src/test/parse-fail/parenthesized-box-expr-message.rs
index 05bbaec37af..05bbaec37af 100644
--- a/src/test/compile-fail/parenthesized-box-expr-message.rs
+++ b/src/test/parse-fail/parenthesized-box-expr-message.rs
diff --git a/src/test/compile-fail/pat-range-bad-dots.rs b/src/test/parse-fail/pat-range-bad-dots.rs
index c52fb8c9b67..c52fb8c9b67 100644
--- a/src/test/compile-fail/pat-range-bad-dots.rs
+++ b/src/test/parse-fail/pat-range-bad-dots.rs
diff --git a/src/test/compile-fail/pat-ref-enum.rs b/src/test/parse-fail/pat-ref-enum.rs
index 062d3308c3d..062d3308c3d 100644
--- a/src/test/compile-fail/pat-ref-enum.rs
+++ b/src/test/parse-fail/pat-ref-enum.rs
diff --git a/src/test/compile-fail/range-3.rs b/src/test/parse-fail/range-3.rs
index 78c575d33ba..78c575d33ba 100644
--- a/src/test/compile-fail/range-3.rs
+++ b/src/test/parse-fail/range-3.rs
diff --git a/src/test/compile-fail/range-4.rs b/src/test/parse-fail/range-4.rs
index a3e27fbbe9a..a3e27fbbe9a 100644
--- a/src/test/compile-fail/range-4.rs
+++ b/src/test/parse-fail/range-4.rs
diff --git a/src/test/compile-fail/raw-byte-string-eof.rs b/src/test/parse-fail/raw-byte-string-eof.rs
index 83ea9db39b7..83ea9db39b7 100644
--- a/src/test/compile-fail/raw-byte-string-eof.rs
+++ b/src/test/parse-fail/raw-byte-string-eof.rs
diff --git a/src/test/compile-fail/raw-byte-string-literals.rs b/src/test/parse-fail/raw-byte-string-literals.rs
index 7a3d1b2318a..7a3d1b2318a 100644
--- a/src/test/compile-fail/raw-byte-string-literals.rs
+++ b/src/test/parse-fail/raw-byte-string-literals.rs
diff --git a/src/test/compile-fail/raw-str-delim.rs b/src/test/parse-fail/raw-str-delim.rs
index 83afb33b641..83afb33b641 100644
--- a/src/test/compile-fail/raw-str-delim.rs
+++ b/src/test/parse-fail/raw-str-delim.rs
diff --git a/src/test/compile-fail/raw-str-unbalanced.rs b/src/test/parse-fail/raw-str-unbalanced.rs
index 3403b28fdc9..3403b28fdc9 100644
--- a/src/test/compile-fail/raw-str-unbalanced.rs
+++ b/src/test/parse-fail/raw-str-unbalanced.rs
diff --git a/src/test/compile-fail/raw-str-unterminated.rs b/src/test/parse-fail/raw-str-unterminated.rs
index 4151cf32346..4151cf32346 100644
--- a/src/test/compile-fail/raw-str-unterminated.rs
+++ b/src/test/parse-fail/raw-str-unterminated.rs
diff --git a/src/test/compile-fail/regions-infer-paramd-method.rs b/src/test/parse-fail/regions-infer-paramd-method.rs
index ef331bb0fd7..ef331bb0fd7 100644
--- a/src/test/compile-fail/regions-infer-paramd-method.rs
+++ b/src/test/parse-fail/regions-infer-paramd-method.rs
diff --git a/src/test/compile-fail/regions-out-of-scope-slice.rs b/src/test/parse-fail/regions-out-of-scope-slice.rs
index c67c14d35d8..c67c14d35d8 100644
--- a/src/test/compile-fail/regions-out-of-scope-slice.rs
+++ b/src/test/parse-fail/regions-out-of-scope-slice.rs
diff --git a/src/test/compile-fail/regions-trait-2.rs b/src/test/parse-fail/regions-trait-2.rs
index 8b36e87db3e..8b36e87db3e 100644
--- a/src/test/compile-fail/regions-trait-2.rs
+++ b/src/test/parse-fail/regions-trait-2.rs
diff --git a/src/test/compile-fail/regions-trait-3.rs b/src/test/parse-fail/regions-trait-3.rs
index 8943abb49ae..8943abb49ae 100644
--- a/src/test/compile-fail/regions-trait-3.rs
+++ b/src/test/parse-fail/regions-trait-3.rs
diff --git a/src/test/compile-fail/removed-syntax-closure-lifetime.rs b/src/test/parse-fail/removed-syntax-closure-lifetime.rs
index 0cea87dba19..0cea87dba19 100644
--- a/src/test/compile-fail/removed-syntax-closure-lifetime.rs
+++ b/src/test/parse-fail/removed-syntax-closure-lifetime.rs
diff --git a/src/test/compile-fail/removed-syntax-enum-newtype.rs b/src/test/parse-fail/removed-syntax-enum-newtype.rs
index b067cee03d2..b067cee03d2 100644
--- a/src/test/compile-fail/removed-syntax-enum-newtype.rs
+++ b/src/test/parse-fail/removed-syntax-enum-newtype.rs
diff --git a/src/test/compile-fail/removed-syntax-extern-const.rs b/src/test/parse-fail/removed-syntax-extern-const.rs
index a0e1d04a3dc..a0e1d04a3dc 100644
--- a/src/test/compile-fail/removed-syntax-extern-const.rs
+++ b/src/test/parse-fail/removed-syntax-extern-const.rs
diff --git a/src/test/compile-fail/removed-syntax-field-let.rs b/src/test/parse-fail/removed-syntax-field-let.rs
index c8711598163..c8711598163 100644
--- a/src/test/compile-fail/removed-syntax-field-let.rs
+++ b/src/test/parse-fail/removed-syntax-field-let.rs
diff --git a/src/test/compile-fail/removed-syntax-field-semicolon.rs b/src/test/parse-fail/removed-syntax-field-semicolon.rs
index 9bb3c649cdf..9bb3c649cdf 100644
--- a/src/test/compile-fail/removed-syntax-field-semicolon.rs
+++ b/src/test/parse-fail/removed-syntax-field-semicolon.rs
diff --git a/src/test/compile-fail/removed-syntax-fixed-vec.rs b/src/test/parse-fail/removed-syntax-fixed-vec.rs
index 0e8e20b3891..0e8e20b3891 100644
--- a/src/test/compile-fail/removed-syntax-fixed-vec.rs
+++ b/src/test/parse-fail/removed-syntax-fixed-vec.rs
diff --git a/src/test/compile-fail/removed-syntax-fn-pure.rs b/src/test/parse-fail/removed-syntax-fn-pure.rs
index d569ea25c46..d569ea25c46 100644
--- a/src/test/compile-fail/removed-syntax-fn-pure.rs
+++ b/src/test/parse-fail/removed-syntax-fn-pure.rs
diff --git a/src/test/compile-fail/removed-syntax-fn-sigil.rs b/src/test/parse-fail/removed-syntax-fn-sigil.rs
index 83ebe7cc7a3..83ebe7cc7a3 100644
--- a/src/test/compile-fail/removed-syntax-fn-sigil.rs
+++ b/src/test/parse-fail/removed-syntax-fn-sigil.rs
diff --git a/src/test/compile-fail/removed-syntax-larrow-init.rs b/src/test/parse-fail/removed-syntax-larrow-init.rs
index 1474cc9dd39..1474cc9dd39 100644
--- a/src/test/compile-fail/removed-syntax-larrow-init.rs
+++ b/src/test/parse-fail/removed-syntax-larrow-init.rs
diff --git a/src/test/compile-fail/removed-syntax-larrow-move.rs b/src/test/parse-fail/removed-syntax-larrow-move.rs
index 552c9f2efa2..552c9f2efa2 100644
--- a/src/test/compile-fail/removed-syntax-larrow-move.rs
+++ b/src/test/parse-fail/removed-syntax-larrow-move.rs
diff --git a/src/test/compile-fail/removed-syntax-mode.rs b/src/test/parse-fail/removed-syntax-mode.rs
index b02de5ce08e..b02de5ce08e 100644
--- a/src/test/compile-fail/removed-syntax-mode.rs
+++ b/src/test/parse-fail/removed-syntax-mode.rs
diff --git a/src/test/compile-fail/removed-syntax-mut-vec-expr.rs b/src/test/parse-fail/removed-syntax-mut-vec-expr.rs
index 30302bbd16e..30302bbd16e 100644
--- a/src/test/compile-fail/removed-syntax-mut-vec-expr.rs
+++ b/src/test/parse-fail/removed-syntax-mut-vec-expr.rs
diff --git a/src/test/compile-fail/removed-syntax-mut-vec-ty.rs b/src/test/parse-fail/removed-syntax-mut-vec-ty.rs
index 9a7570a92f0..9a7570a92f0 100644
--- a/src/test/compile-fail/removed-syntax-mut-vec-ty.rs
+++ b/src/test/parse-fail/removed-syntax-mut-vec-ty.rs
diff --git a/src/test/compile-fail/removed-syntax-ptr-lifetime.rs b/src/test/parse-fail/removed-syntax-ptr-lifetime.rs
index 44c65d98c0b..44c65d98c0b 100644
--- a/src/test/compile-fail/removed-syntax-ptr-lifetime.rs
+++ b/src/test/parse-fail/removed-syntax-ptr-lifetime.rs
diff --git a/src/test/compile-fail/removed-syntax-record.rs b/src/test/parse-fail/removed-syntax-record.rs
index ae5a68575f7..ae5a68575f7 100644
--- a/src/test/compile-fail/removed-syntax-record.rs
+++ b/src/test/parse-fail/removed-syntax-record.rs
diff --git a/src/test/compile-fail/removed-syntax-static-fn.rs b/src/test/parse-fail/removed-syntax-static-fn.rs
index caf939e7b8a..caf939e7b8a 100644
--- a/src/test/compile-fail/removed-syntax-static-fn.rs
+++ b/src/test/parse-fail/removed-syntax-static-fn.rs
diff --git a/src/test/compile-fail/removed-syntax-uniq-mut-expr.rs b/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs
index c5559c4ea96..c5559c4ea96 100644
--- a/src/test/compile-fail/removed-syntax-uniq-mut-expr.rs
+++ b/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs
diff --git a/src/test/compile-fail/removed-syntax-uniq-mut-ty.rs b/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs
index d1c2fc69f52..d1c2fc69f52 100644
--- a/src/test/compile-fail/removed-syntax-uniq-mut-ty.rs
+++ b/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs
diff --git a/src/test/compile-fail/removed-syntax-with-1.rs b/src/test/parse-fail/removed-syntax-with-1.rs
index c7f31045cb6..c7f31045cb6 100644
--- a/src/test/compile-fail/removed-syntax-with-1.rs
+++ b/src/test/parse-fail/removed-syntax-with-1.rs
diff --git a/src/test/compile-fail/removed-syntax-with-2.rs b/src/test/parse-fail/removed-syntax-with-2.rs
index 83c6897dee3..83c6897dee3 100644
--- a/src/test/compile-fail/removed-syntax-with-2.rs
+++ b/src/test/parse-fail/removed-syntax-with-2.rs
diff --git a/src/test/compile-fail/reserved-be.rs b/src/test/parse-fail/reserved-be.rs
index 386d53cc16e..386d53cc16e 100644
--- a/src/test/compile-fail/reserved-be.rs
+++ b/src/test/parse-fail/reserved-be.rs
diff --git a/src/test/compile-fail/struct-literal-in-for.rs b/src/test/parse-fail/struct-literal-in-for.rs
index 4bb5d5e6aa1..4bb5d5e6aa1 100644
--- a/src/test/compile-fail/struct-literal-in-for.rs
+++ b/src/test/parse-fail/struct-literal-in-for.rs
diff --git a/src/test/compile-fail/struct-literal-in-if.rs b/src/test/parse-fail/struct-literal-in-if.rs
index b2bc8a4901f..b2bc8a4901f 100644
--- a/src/test/compile-fail/struct-literal-in-if.rs
+++ b/src/test/parse-fail/struct-literal-in-if.rs
diff --git a/src/test/compile-fail/struct-literal-in-match-discriminant.rs b/src/test/parse-fail/struct-literal-in-match-discriminant.rs
index e6948b7c7c9..e6948b7c7c9 100644
--- a/src/test/compile-fail/struct-literal-in-match-discriminant.rs
+++ b/src/test/parse-fail/struct-literal-in-match-discriminant.rs
diff --git a/src/test/compile-fail/struct-literal-in-while.rs b/src/test/parse-fail/struct-literal-in-while.rs
index 05fa3a8dd5f..05fa3a8dd5f 100644
--- a/src/test/compile-fail/struct-literal-in-while.rs
+++ b/src/test/parse-fail/struct-literal-in-while.rs
diff --git a/src/test/compile-fail/struct-no-fields-enumlike.rs b/src/test/parse-fail/struct-no-fields-enumlike.rs
index 379d310a60b..379d310a60b 100644
--- a/src/test/compile-fail/struct-no-fields-enumlike.rs
+++ b/src/test/parse-fail/struct-no-fields-enumlike.rs
diff --git a/src/test/compile-fail/struct-no-fields.rs b/src/test/parse-fail/struct-no-fields.rs
index ee853ade18e..ee853ade18e 100644
--- a/src/test/compile-fail/struct-no-fields.rs
+++ b/src/test/parse-fail/struct-no-fields.rs
diff --git a/src/test/compile-fail/trait-keyword.rs b/src/test/parse-fail/trait-keyword.rs
index e60be6c81eb..e60be6c81eb 100644
--- a/src/test/compile-fail/trait-keyword.rs
+++ b/src/test/parse-fail/trait-keyword.rs
diff --git a/src/test/compile-fail/unbalanced-doublequote.rs b/src/test/parse-fail/unbalanced-doublequote.rs
index 789cc886217..789cc886217 100644
--- a/src/test/compile-fail/unbalanced-doublequote.rs
+++ b/src/test/parse-fail/unbalanced-doublequote.rs
diff --git a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-3.rs b/src/test/parse-fail/unboxed-closure-sugar-used-on-struct-3.rs
index d86f55d5368..d86f55d5368 100644
--- a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-3.rs
+++ b/src/test/parse-fail/unboxed-closure-sugar-used-on-struct-3.rs
diff --git a/src/test/compile-fail/unsized.rs b/src/test/parse-fail/unsized.rs
index 92dbea0424b..92dbea0424b 100644
--- a/src/test/compile-fail/unsized.rs
+++ b/src/test/parse-fail/unsized.rs
diff --git a/src/test/compile-fail/use-as-where-use-ends-with-mod-sep.rs b/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs
index 524fd01b94c..524fd01b94c 100644
--- a/src/test/compile-fail/use-as-where-use-ends-with-mod-sep.rs
+++ b/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs
diff --git a/src/test/compile-fail/use-ends-with-mod-sep.rs b/src/test/parse-fail/use-ends-with-mod-sep.rs
index a375a5962a5..a375a5962a5 100644
--- a/src/test/compile-fail/use-ends-with-mod-sep.rs
+++ b/src/test/parse-fail/use-ends-with-mod-sep.rs
diff --git a/src/test/compile-fail/use-mod-4.rs b/src/test/parse-fail/use-mod-4.rs
index a8b551b5376..a8b551b5376 100644
--- a/src/test/compile-fail/use-mod-4.rs
+++ b/src/test/parse-fail/use-mod-4.rs
diff --git a/src/test/compile-fail/variadic-ffi-1.rs b/src/test/parse-fail/variadic-ffi-1.rs
index 34846ab496d..34846ab496d 100644
--- a/src/test/compile-fail/variadic-ffi-1.rs
+++ b/src/test/parse-fail/variadic-ffi-1.rs
diff --git a/src/test/compile-fail/variadic-ffi-3.rs b/src/test/parse-fail/variadic-ffi-3.rs
index 331a4523934..331a4523934 100644
--- a/src/test/compile-fail/variadic-ffi-3.rs
+++ b/src/test/parse-fail/variadic-ffi-3.rs
diff --git a/src/test/compile-fail/variadic-ffi-4.rs b/src/test/parse-fail/variadic-ffi-4.rs
index 62e985f44f7..62e985f44f7 100644
--- a/src/test/compile-fail/variadic-ffi-4.rs
+++ b/src/test/parse-fail/variadic-ffi-4.rs