Auto merge of #55236 - petrochenkov:pfail, r=davidtwco

Move parse-fail tests to UI

cc https://github.com/rust-lang/rust/issues/53353

r? @davidtwco

src/bootstrap/builder.rs

@@ -379,7 +379,6 @@ fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
                 test::Ui,
                 test::RunPass,
                 test::CompileFail,
-                test::ParseFail,
                 test::RunFail,
                 test::RunPassValgrind,
                 test::MirOpt,

src/bootstrap/test.rs

@@ -773,12 +773,6 @@ fn run(self, builder: &Builder) {
     suite: "compile-fail"
 });
 
-default_test!(ParseFail {
-    path: "src/test/parse-fail",
-    mode: "parse-fail",
-    suite: "parse-fail"
-});
-
 default_test!(RunFail {
     path: "src/test/run-fail",
     mode: "run-fail",

src/ci/docker/wasm32-unknown/Dockerfile

@@ -36,7 +36,6 @@ ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \
   src/test/ui \
   src/test/run-pass \
   src/test/compile-fail \
-  src/test/parse-fail \
   src/test/mir-opt \
   src/test/codegen-units \
   src/libcore \

src/etc/generate-keyword-tests.py

@@ -44,7 +44,7 @@ fn main() {
 """
 
 test_dir = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '../test/parse-fail')
+    os.path.join(os.path.dirname(__file__), '../test/ui/parser')
 )
 
 for kw in sys.argv[1:]:

src/libsyntax/parse/mod.rs

@@ -230,7 +230,7 @@ fn file_to_source_file(sess: &ParseSess, path: &Path, spanopt: Option<Span>)
     match sess.source_map().load_file(path) {
         Ok(source_file) => source_file,
         Err(e) => {
-            let msg = format!("couldn't read {:?}: {}", path.display(), e);
+            let msg = format!("couldn't read {}: {}", path.display(), e);
             match spanopt {
                 Some(sp) => sess.span_diagnostic.span_fatal(sp, &msg).raise(),
                 None => sess.span_diagnostic.fatal(&msg).raise()

src/test/parse-fail/multiline-comment-line-tracking.rs

-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern:18:3
-
-/* 1
- * 2
- * 3
- */
-fn main() {
-  %; // parse error on line 18, but is reported on line 6 instead.
-}

src/test/ui/parser/ascii-only-character-escape.stderr

+error: this form of character escape may only be used with characters in the range [/x00-/x7f]
+  --> $DIR/ascii-only-character-escape.rs:14:16
+   |
+LL |     let x = "/x80"; //~ ERROR may only be used
+   |                ^^
+
+error: this form of character escape may only be used with characters in the range [/x00-/x7f]
+  --> $DIR/ascii-only-character-escape.rs:15:16
+   |
+LL |     let y = "/xff"; //~ ERROR may only be used
+   |                ^^
+
+error: this form of character escape may only be used with characters in the range [/x00-/x7f]
+  --> $DIR/ascii-only-character-escape.rs:16:16
+   |
+LL |     let z = "/xe2"; //~ ERROR may only be used
+   |                ^^
+
+error: aborting due to 3 previous errors
+

src/test/ui/parser/assoc-oddities-1.stderr

+error: expected one of `.`, `;`, `?`, or `}`, found `[`
+  --> $DIR/assoc-oddities-1.rs:20:28
+   |
+LL |     ..if c { a } else { b }[n]; //~ ERROR expected one of
+   |                            ^ expected one of `.`, `;`, `?`, or `}` here
+
+error: aborting due to previous error
+

src/test/ui/parser/assoc-oddities-2.stderr

+error: expected one of `.`, `;`, `?`, or `}`, found `[`
+  --> $DIR/assoc-oddities-2.rs:15:29
+   |
+LL |     x..if c { a } else { b }[n]; //~ ERROR expected one of
+   |                             ^ expected one of `.`, `;`, `?`, or `}` here
+
+error: aborting due to previous error
+

src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr

+error: expected identifier, found keyword `for`
+  --> $DIR/associated-types-project-from-hrtb-explicit.rs:22:21
+   |
+LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
+   |                     ^^^ expected identifier, found keyword
+
+error: expected one of `::` or `>`, found `Foo`
+  --> $DIR/associated-types-project-from-hrtb-explicit.rs:22:29
+   |
+LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
+   |                             ^^^ expected one of `::` or `>` here
+
+error: aborting due to 2 previous errors
+

src/test/parse-fail/attr-bad-meta-2.rs → src/test/ui/parser/attr-bad-meta-2.rs

@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #[path =] //~ ERROR unexpected token: `]`
 mod m {}

src/test/ui/parser/attr-bad-meta-2.stderr

+error: unexpected token: `]`
+  --> $DIR/attr-bad-meta-2.rs:13:9
+   |
+LL | #[path =] //~ ERROR unexpected token: `]`
+   |         ^ unexpected token after this
+
+error: aborting due to previous error
+

src/test/parse-fail/attr-bad-meta-3.rs → src/test/ui/parser/attr-bad-meta-3.rs

@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #[path() token] //~ ERROR expected `]`, found `token`
 mod m {}

src/test/ui/parser/attr-bad-meta-3.stderr

+error: expected `]`, found `token`
+  --> $DIR/attr-bad-meta-3.rs:13:10
+   |
+LL | #[path() token] //~ ERROR expected `]`, found `token`
+   |          ^^^^^ expected `]`
+
+error: aborting due to previous error
+

src/test/parse-fail/attr-bad-meta.rs → src/test/ui/parser/attr-bad-meta.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #![feature(unrestricted_attribute_tokens)]
 
 #[path*] //~ ERROR expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`

src/test/ui/parser/attr-bad-meta.stderr

+error: expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`
+  --> $DIR/attr-bad-meta.rs:15:7
+   |
+LL | #[path*] //~ ERROR expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`
+   |       ^ expected one of `(`, `::`, `=`, `[`, `]`, or `{` here
+
+error: aborting due to previous error
+

src/test/ui/parser/attr-before-eof.stderr

+error: expected item after attributes
+  --> $DIR/attr-before-eof.rs:13:16
+   |
+LL | #[derive(Debug)] //~ERROR expected item after attributes
+   |                ^
+
+error: aborting due to previous error
+

src/test/ui/parser/attr-dangling-in-fn.stderr

+error: expected statement after outer attribute
+  --> $DIR/attr-dangling-in-fn.rs:17:1
+   |
+LL | }
+   | ^
+
+error: aborting due to previous error
+

src/test/ui/parser/attr-dangling-in-mod.stderr

+error: expected item after attributes
+  --> $DIR/attr-dangling-in-mod.rs:18:14
+   |
+LL | #[foo = "bar"]
+   |              ^
+
+error: aborting due to previous error
+

src/test/ui/parser/attr.stderr

+error: an inner attribute is not permitted in this context
+  --> $DIR/attr.rs:17:3
+   |
+LL | #![lang(foo)] //~ ERROR an inner attribute is not permitted in this context
+   |   ^
+   |
+   = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
+
+error: aborting due to previous error
+

src/test/ui/parser/attrs-after-extern-mod.stderr

+error: expected item after attributes
+  --> $DIR/attrs-after-extern-mod.rs:22:19
+   |
+LL |     #[cfg(stage37)] //~ ERROR expected item after attributes
+   |                   ^
+
+error: aborting due to previous error
+

src/test/ui/parser/bad-char-literals.stderr

+error: character constant must be escaped: '
+  --> $DIR/bad-char-literals.rs:17:6
+   |
+LL |     ''';
+   |      ^
+
+error: character constant must be escaped: /n
+  --> $DIR/bad-char-literals.rs:21:6
+   |
+LL |       '
+   |  ______^
+LL | | ';
+   | |_
+
+error: character constant must be escaped: /r
+  --> $DIR/bad-char-literals.rs:26:6
+   |
+LL |     '
'; //~ ERROR: character constant must be escaped: /r
+   |      ^
+
+error: character constant must be escaped: /t
+  --> $DIR/bad-char-literals.rs:29:6
+   |
+LL |     '    ';
+   |      ^^^^
+
+error: aborting due to 4 previous errors
+

src/test/ui/parser/bad-lit-suffixes.stderr

+error: ABI spec with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:15:5
+   |
+LL |     "C"suffix //~ ERROR ABI spec with a suffix is invalid
+   |     ^^^^^^^^^
+
+error: ABI spec with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:19:5
+   |
+LL |     "C"suffix //~ ERROR ABI spec with a suffix is invalid
+   |     ^^^^^^^^^
+
+error: string literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:23:5
+   |
+LL |     ""suffix; //~ ERROR string literal with a suffix is invalid
+   |     ^^^^^^^^
+
+error: byte string literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:24:5
+   |
+LL |     b""suffix; //~ ERROR byte string literal with a suffix is invalid
+   |     ^^^^^^^^^
+
+error: string literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:25:5
+   |
+LL |     r#""#suffix; //~ ERROR string literal with a suffix is invalid
+   |     ^^^^^^^^^^^
+
+error: byte string literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:26:5
+   |
+LL |     br#""#suffix; //~ ERROR byte string literal with a suffix is invalid
+   |     ^^^^^^^^^^^^
+
+error: char literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:27:5
+   |
+LL |     'a'suffix; //~ ERROR char literal with a suffix is invalid
+   |     ^^^^^^^^^
+
+error: byte literal with a suffix is invalid
+  --> $DIR/bad-lit-suffixes.rs:28:5
+   |
+LL |     b'a'suffix; //~ ERROR byte literal with a suffix is invalid
+   |     ^^^^^^^^^^
+
+error: invalid width `1024` for integer literal
+  --> $DIR/bad-lit-suffixes.rs:30:5
+   |
+LL |     1234u1024; //~ ERROR invalid width `1024` for integer literal
+   |     ^^^^^^^^^
+   |
+   = help: valid widths are 8, 16, 32, 64 and 128
+
+error: invalid width `1024` for integer literal
+  --> $DIR/bad-lit-suffixes.rs:31:5
+   |
+LL |     1234i1024; //~ ERROR invalid width `1024` for integer literal
+   |     ^^^^^^^^^
+   |
+   = help: valid widths are 8, 16, 32, 64 and 128
+
+error: invalid width `1024` for float literal
+  --> $DIR/bad-lit-suffixes.rs:32:5
+   |
+LL |     1234f1024; //~ ERROR invalid width `1024` for float literal
+   |     ^^^^^^^^^
+   |
+   = help: valid widths are 32 and 64
+
+error: invalid width `1024` for float literal
+  --> $DIR/bad-lit-suffixes.rs:33:5
+   |
+LL |     1234.5f1024; //~ ERROR invalid width `1024` for float literal
+   |     ^^^^^^^^^^^
+   |
+   = help: valid widths are 32 and 64
+
+error: invalid suffix `suffix` for numeric literal
+  --> $DIR/bad-lit-suffixes.rs:35:5
+   |
+LL |     1234suffix; //~ ERROR invalid suffix `suffix` for numeric literal
+   |     ^^^^^^^^^^
+   |
+   = help: the suffix must be one of the integral types (`u32`, `isize`, etc)
+
+error: invalid suffix `suffix` for numeric literal
+  --> $DIR/bad-lit-suffixes.rs:36:5
+   |
+LL |     0b101suffix; //~ ERROR invalid suffix `suffix` for numeric literal
+   |     ^^^^^^^^^^^
+   |
+   = help: the suffix must be one of the integral types (`u32`, `isize`, etc)
+
+error: invalid suffix `suffix` for float literal
+  --> $DIR/bad-lit-suffixes.rs:37:5
+   |
+LL |     1.0suffix; //~ ERROR invalid suffix `suffix` for float literal
+   |     ^^^^^^^^^
+   |
+   = help: valid suffixes are `f32` and `f64`
+
+error: invalid suffix `suffix` for float literal
+  --> $DIR/bad-lit-suffixes.rs:38:5
+   |
+LL |     1.0e10suffix; //~ ERROR invalid suffix `suffix` for float literal
+   |     ^^^^^^^^^^^^
+   |
+   = help: valid suffixes are `f32` and `f64`
+
+error: aborting due to 16 previous errors
+

src/test/ui/parser/bad-match.stderr

+error: expected one of `:`, `;`, `=`, or `@`, found `x`
+  --> $DIR/bad-match.rs:16:13
+   |
+LL |   let isize x = 5;
+   |             ^ expected one of `:`, `;`, `=`, or `@` here
+
+error: aborting due to previous error
+

src/test/ui/parser/bad-name.stderr

+error: expected one of `:`, `;`, `=`, or `@`, found `.`
+  --> $DIR/bad-name.rs:16:8
+   |
+LL |   let x.y::<isize>.z foo;
+   |        ^ expected one of `:`, `;`, `=`, or `@` here
+
+error: aborting due to previous error
+

src/test/ui/parser/bad-pointer-type.stderr

+error: expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
+  --> $DIR/bad-pointer-type.rs:13:11
+   |
+LL | fn foo(_: *()) {
+   |           ^
+
+error: aborting due to previous error
+

src/test/ui/parser/bad-value-ident-false.stderr

+error: expected identifier, found keyword `false`
+  --> $DIR/bad-value-ident-false.rs:13:4
+   |
+LL | fn false() { } //~ ERROR expected identifier, found keyword `false`
+   |    ^^^^^ expected identifier, found keyword
+
+error: aborting due to previous error
+

src/test/ui/parser/bad-value-ident-true.stderr

+error: expected identifier, found keyword `true`
+  --> $DIR/bad-value-ident-true.rs:13:4
+   |
+LL | fn true() { } //~ ERROR expected identifier, found keyword `true`
+   |    ^^^^ expected identifier, found keyword
+
+error: aborting due to previous error
+

src/test/ui/parser/better-expected.stderr

+error: expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `3`
+  --> $DIR/better-expected.rs:14:19
+   |
+LL |     let x: [isize 3]; //~ ERROR expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `3`
+   |         -         ^ expected one of 7 possible tokens here
+   |         |
+   |         while parsing the type for `x`
+
+error: aborting due to previous error
+

src/test/ui/parser/bind-struct-early-modifiers.stderr

+error: expected `,`
+  --> $DIR/bind-struct-early-modifiers.rs:16:19
+   |
+LL |         Foo { ref x: ref x } => {}, //~ ERROR expected `,`
+   |                   ^
+
+error: aborting due to previous error
+

src/test/ui/parser/bound-single-question-mark.stderr

+error: expected identifier, found `>`
+  --> $DIR/bound-single-question-mark.rs:13:10
+   |
+LL | fn f<T: ?>() {} //~ ERROR expected identifier, found `>`
+   |          ^ expected identifier
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-lifetime-1.stderr

+error: expected one of `,`, `:`, or `>`, found `'b`
+  --> $DIR/bounds-lifetime-1.rs:13:17
+   |
+LL | type A = for<'a 'b> fn(); //~ ERROR expected one of `,`, `:`, or `>`, found `'b`
+   |                 ^^ expected one of `,`, `:`, or `>` here
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-lifetime-2.stderr

+error: expected one of `,`, `:`, or `>`, found `+`
+  --> $DIR/bounds-lifetime-2.rs:13:17
+   |
+LL | type A = for<'a + 'b> fn(); //~ ERROR expected one of `,`, `:`, or `>`, found `+`
+   |                 ^ expected one of `,`, `:`, or `>` here
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-lifetime-where-1.stderr

+error: expected `:`, found `;`
+  --> $DIR/bounds-lifetime-where-1.rs:13:16
+   |
+LL | type A where 'a; //~ ERROR expected `:`, found `;`
+   |                ^ expected `:`
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-lifetime-where.stderr

+error: expected one of `=`, lifetime, or type, found `,`
+  --> $DIR/bounds-lifetime-where.rs:20:14
+   |
+LL | type A where , = u8; //~ ERROR expected one of `=`, lifetime, or type, found `,`
+   |              ^ expected one of `=`, lifetime, or type here
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-lifetime.stderr

+error: expected one of `>`, identifier, or lifetime, found `,`
+  --> $DIR/bounds-lifetime.rs:21:14
+   |
+LL | type A = for<,> fn(); //~ ERROR expected one of `>`, identifier, or lifetime, found `,`
+   |              ^ expected one of `>`, identifier, or lifetime here
+
+error: aborting due to previous error
+

src/test/ui/token/bounds-obj-parens.rs → src/test/ui/parser/bounds-obj-parens.rs

@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-pass
 // compile-flags: -Z parse-only
 
 type A = Box<(Fn(D::Error) -> E) + 'static + Send + Sync>; // OK (but see #39318)
-
-FAIL
-//~^ ERROR

src/test/ui/parser/bounds-type-where.stderr

+error: expected one of `!`, `(`, `+`, `::`, `:`, `<`, `==`, or `=`, found `,`
+  --> $DIR/bounds-type-where.rs:20:15
+   |
+LL | type A where T, = u8;
+   |               ^ expected one of 8 possible tokens here
+
+error: aborting due to previous error
+

src/test/ui/parser/bounds-type.stderr

+error: `?` may only modify trait bounds, not lifetime bounds
+  --> $DIR/bounds-type.rs:20:8
+   |
+LL |     T: ?'a, //~ ERROR `?` may only modify trait bounds, not lifetime bounds
+   |        ^
+
+error: aborting due to previous error
+

src/test/ui/parser/brace-after-qualified-path-in-match.stderr

+error: unexpected `{` after qualified path
+  --> $DIR/brace-after-qualified-path-in-match.rs:15:27
+   |
+LL |         <T as Trait>::Type{key: value} => (),
+   |                           ^ unexpected `{` after qualified path
+
+error: aborting due to previous error
+

src/test/ui/parser/byte-literals.stderr

+error: unknown byte escape: f
+  --> $DIR/byte-literals.rs:16:21
+   |
+LL | static FOO: u8 = b'/f';  //~ ERROR unknown byte escape
+   |                     ^
+
+error: unknown byte escape: f
+  --> $DIR/byte-literals.rs:19:8
+   |
+LL |     b'/f';  //~ ERROR unknown byte escape
+   |        ^
+
+error: invalid character in numeric character escape: Z
+  --> $DIR/byte-literals.rs:20:10
+   |
+LL |     b'/x0Z';  //~ ERROR invalid character in numeric character escape: Z
+   |          ^
+
+error: byte constant must be escaped: /t
+  --> $DIR/byte-literals.rs:21:7
+   |
+LL |     b'    ';  //~ ERROR byte constant must be escaped
+   |       ^^^^
+
+error: byte constant must be escaped: '
+  --> $DIR/byte-literals.rs:22:7
+   |
+LL |     b''';  //~ ERROR byte constant must be escaped
+   |       ^
+
+error: byte constant must be ASCII. Use a /xHH escape for a non-ASCII byte
+  --> $DIR/byte-literals.rs:23:7
+   |
+LL |     b'é';  //~ ERROR byte constant must be ASCII
+   |       ^
+
+error: unterminated byte constant: b'a
+  --> $DIR/byte-literals.rs:24:5
+   |
+LL |     b'a  //~ ERROR unterminated byte constant
+   |     ^^^
+
+error: aborting due to 7 previous errors
+

src/test/ui/parser/byte-string-literals.stderr

+error: unknown byte escape: f
+  --> $DIR/byte-string-literals.rs:16:32
+   |
+LL | static FOO: &'static [u8] = b"/f";  //~ ERROR unknown byte escape
+   |                                ^
+
+error: unknown byte escape: f
+  --> $DIR/byte-string-literals.rs:19:8
+   |
+LL |     b"/f";  //~ ERROR unknown byte escape
+   |        ^
+
+error: invalid character in numeric character escape: Z
+  --> $DIR/byte-string-literals.rs:20:10
+   |
+LL |     b"/x0Z";  //~ ERROR invalid character in numeric character escape: Z
+   |          ^
+
+error: byte constant must be ASCII. Use a /xHH escape for a non-ASCII byte
+  --> $DIR/byte-string-literals.rs:21:7
+   |
+LL |     b"é";  //~ ERROR byte constant must be ASCII
+   |       ^
+
+error: unterminated double quote byte string
+  --> $DIR/byte-string-literals.rs:22:7
+   |
+LL |       b"a  //~ ERROR unterminated double quote byte string
+   |  _______^
+LL | | }
+   | |__^
+
+error: aborting due to 5 previous errors
+

src/test/ui/parser/circular_modules_main.stderr

+error: circular modules: $DIR/circular_modules_hello.rs -> $DIR/circular_modules_main.rs -> $DIR/circular_modules_hello.rs
+  --> $DIR/circular_modules_main.rs:14:5
+   |
+LL | mod circular_modules_hello; //~ ERROR: circular modules
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+

src/test/ui/parser/class-implements-bad-trait.stderr

+error: expected one of `!` or `::`, found `cat`
+  --> $DIR/class-implements-bad-trait.rs:14:7
+   |
+LL | class cat : nonexistent {
+   |       ^^^ expected one of `!` or `::` here
+
+error: aborting due to previous error
+

src/test/parse-fail/closure-return-syntax.rs → src/test/ui/parser/closure-return-syntax.rs

@@ -11,6 +11,8 @@
 // Test that we cannot parse a closure with an explicit return type
 // unless it uses braces.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     let x = || -> i32 22;
     //~^ ERROR expected one of `!`, `(`, `+`, `::`, `<`, or `{`, found `22`

src/test/ui/parser/closure-return-syntax.stderr

+error: expected one of `!`, `(`, `+`, `::`, `<`, or `{`, found `22`
+  --> $DIR/closure-return-syntax.rs:17:23
+   |
+LL |     let x = || -> i32 22;
+   |                       ^^ expected one of `!`, `(`, `+`, `::`, `<`, or `{` here
+
+error: aborting due to previous error
+

src/test/ui/parser/column-offset-1-based.stderr

+error: expected `[`, found `<eof>`
+  --> $DIR/column-offset-1-based.rs:13:1
+   |
+LL | # //~ ERROR 13:1: 13:2: expected `[`, found `<eof>`
+   | ^ expected `[`
+
+error: aborting due to previous error
+

src/test/ui/parser/default.stderr

+error: expected one of `async`, `const`, `existential`, `extern`, `fn`, `type`, or `unsafe`, found `pub`
+  --> $DIR/default.rs:32:13
+   |
+LL |     default pub fn foo<T: Default>() -> T { T::default() } //~ ERROR expected one of
+   |             ^^^ expected one of 7 possible tokens here
+
+error: aborting due to previous error
+

src/test/ui/parser/do-catch-suggests-try.stderr

+error: found removed `do catch` syntax
+  --> $DIR/do-catch-suggests-try.rs:14:25
+   |
+LL |     let _: Option<()> = do catch {};
+   |                         ^^
+   |
+   = help: Following RFC #2388, the new non-placeholder syntax is `try`
+
+error: aborting due to previous error
+

src/test/parse-fail/doc-after-struct-field.rs → src/test/ui/parser/doc-after-struct-field.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -Z continue-parse-after-error
+// compile-flags: -Z parse-only -Z continue-parse-after-error
 
 struct X {
     a: u8 /** document a */,

src/test/ui/parser/doc-after-struct-field.stderr

+error[E0585]: found a documentation comment that doesn't document anything
+  --> $DIR/doc-after-struct-field.rs:14:11
+   |
+LL |     a: u8 /** document a */,
+   |           ^^^^^^^^^^^^^^^^^
+   |
+   = help: doc comments must come before what they document, maybe a comment was intended with `//`?
+
+error[E0585]: found a documentation comment that doesn't document anything
+  --> $DIR/doc-after-struct-field.rs:20:11
+   |
+LL |     a: u8 /// document a
+   |           ^^^^^^^^^^^^^^
+   |
+   = help: doc comments must come before what they document, maybe a comment was intended with `//`?
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0585`.

src/test/ui/parser/doc-before-attr.stderr

+error: expected item after attributes
+  --> $DIR/doc-before-attr.rs:14:16
+   |
+LL | #[derive(Debug)] //~ERROR expected item after attributes
+   |                ^
+
+error: aborting due to previous error
+

src/test/ui/parser/doc-before-eof.stderr

+error: expected item after doc comment
+  --> $DIR/doc-before-eof.rs:13:1
+   |
+LL | /// hi //~ERROR expected item after doc comment
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+

src/test/ui/parser/doc-before-extern-rbrace.stderr

+error: expected item after doc comment
+  --> $DIR/doc-before-extern-rbrace.rs:14:5
+   |
+LL |     /// hi
+   |     ^^^^^^
+
+error: aborting due to previous error
+

src/test/parse-fail/doc-before-fn-rbrace.rs → src/test/ui/parser/doc-before-fn-rbrace.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -Z continue-parse-after-error
+// compile-flags: -Z parse-only -Z continue-parse-after-error
+
 fn main() {
     /// document
     //~^ ERROR found a documentation comment that doesn't document anything

src/test/ui/parser/doc-before-fn-rbrace.stderr

+error[E0585]: found a documentation comment that doesn't document anything
+  --> $DIR/doc-before-fn-rbrace.rs:14:5
+   |
+LL |     /// document
+   |     ^^^^^^^^^^^^
+   |
+   = help: doc comments must come before what they document, maybe a comment was intended with `//`?
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0585`.

src/test/parse-fail/doc-before-identifier.rs → src/test/ui/parser/doc-before-identifier.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -Z continue-parse-after-error
+// compile-flags: -Z parse-only -Z continue-parse-after-error
+
 fn /// document
 foo() {}
 //~^^ ERROR expected identifier, found `/// document`

src/test/ui/parser/doc-before-identifier.stderr

+error: expected identifier, found `/// document`
+  --> $DIR/doc-before-identifier.rs:13:4
+   |
+LL | fn /// document
+   |    ^^^^^^^^^^^^ expected identifier
+
+error: aborting due to previous error
+

src/test/parse-fail/doc-before-mod-rbrace.rs → src/test/ui/parser/doc-before-mod-rbrace.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -Z continue-parse-after-error
+// compile-flags: -Z parse-only -Z continue-parse-after-error
+
 mod Foo {
     /// document
     //~^ ERROR expected item after doc comment

src/test/ui/parser/doc-before-mod-rbrace.stderr

+error: expected item after doc comment
+  --> $DIR/doc-before-mod-rbrace.rs:14:5
+   |
+LL |     /// document
+   |     ^^^^^^^^^^^^
+
+error: aborting due to previous error
+