mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix tidy

Browse source
This commit is contained in:
Esteban Küber 2019-05-31 13:50:04 -07:00
parent 860dce794c
commit d6ea6b972d
69 changed files with 142 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/fmt/format-string-error-2.rs
View file

@ -1,4 +1,3 @@
// ignore-tidy-tab
fn main() {

36
src/test/ui/fmt/format-string-error-2.stderr
View file

@ -1,5 +1,5 @@
error: incorrect unicode escape sequence
--> $DIR/format-string-error-2.rs:78:20
--> $DIR/format-string-error-2.rs:77:20
|
LL | println!("\x7B}\u8 {", 1);
| ^^-
@ -7,7 +7,7 @@ LL | println!("\x7B}\u8 {", 1);
| help: format of unicode escape sequences uses braces: `\u{8}`
error: invalid format string: expected `'}'`, found `'a'`
--> $DIR/format-string-error-2.rs:6:5
--> $DIR/format-string-error-2.rs:5:5
|
LL | format!("{
| - because of this opening brace
@ -17,7 +17,7 @@ LL | a");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'b'`
--> $DIR/format-string-error-2.rs:10:5
--> $DIR/format-string-error-2.rs:9:5
|
LL | format!("{ \
| - because of this opening brace
@ -28,7 +28,7 @@ LL | b");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:12:18
--> $DIR/format-string-error-2.rs:11:18
|
LL | format!(r#"{ \
| - ^ expected `}` in format string
@ -38,7 +38,7 @@ LL | format!(r#"{ \
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:16:18
--> $DIR/format-string-error-2.rs:15:18
|
LL | format!(r#"{ \n
| - ^ expected `}` in format string
@ -48,7 +48,7 @@ LL | format!(r#"{ \n
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'e'`
--> $DIR/format-string-error-2.rs:22:5
--> $DIR/format-string-error-2.rs:21:5
|
LL | format!("{ \n
| - because of this opening brace
@ -59,7 +59,7 @@ LL | e");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'a'`
--> $DIR/format-string-error-2.rs:26:5
--> $DIR/format-string-error-2.rs:25:5
|
LL | {
| - because of this opening brace
@ -69,7 +69,7 @@ LL | a");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'a'`
--> $DIR/format-string-error-2.rs:30:5
--> $DIR/format-string-error-2.rs:29:5
|
LL | {
| - because of this opening brace
@ -79,7 +79,7 @@ LL | a
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'b'`
--> $DIR/format-string-error-2.rs:36:5
--> $DIR/format-string-error-2.rs:35:5
|
LL | { \
| - because of this opening brace
@ -90,7 +90,7 @@ LL | b");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'b'`
--> $DIR/format-string-error-2.rs:41:5
--> $DIR/format-string-error-2.rs:40:5
|
LL | { \
| - because of this opening brace
@ -101,7 +101,7 @@ LL | b \
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:46:8
--> $DIR/format-string-error-2.rs:45:8
|
LL | raw { \
| - ^ expected `}` in format string
@ -111,7 +111,7 @@ LL | raw { \
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:51:8
--> $DIR/format-string-error-2.rs:50:8
|
LL | raw { \n
| - ^ expected `}` in format string
@ -121,7 +121,7 @@ LL | raw { \n
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'e'`
--> $DIR/format-string-error-2.rs:58:5
--> $DIR/format-string-error-2.rs:57:5
|
LL | { \n
| - because of this opening brace
@ -132,7 +132,7 @@ LL | e");
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: expected `'}'`, found `'a'`
--> $DIR/format-string-error-2.rs:68:5
--> $DIR/format-string-error-2.rs:67:5
|
LL | {
| - because of this opening brace
@ -142,13 +142,13 @@ LL | asdf}
= note: if you intended to print `{`, you can escape it using `{{`
error: 1 positional argument in format string, but no arguments were given
--> $DIR/format-string-error-2.rs:71:17
--> $DIR/format-string-error-2.rs:70:17
|
LL | println!("\t{}");
| ^^
error: invalid format string: expected `'}'` but string was terminated
--> $DIR/format-string-error-2.rs:75:27
--> $DIR/format-string-error-2.rs:74:27
|
LL | println!("\x7B}\u{8} {", 1);
| -^ expected `'}'` in format string
@ -158,7 +158,7 @@ LL | println!("\x7B}\u{8} {", 1);
= note: if you intended to print `{`, you can escape it using `{{`
error: invalid format string: unmatched `}` found
--> $DIR/format-string-error-2.rs:82:21
--> $DIR/format-string-error-2.rs:81:21
|
LL | println!(r#"\x7B}\u{8} {"#, 1);
| ^ unmatched `}` in format string
@ -166,7 +166,7 @@ LL | println!(r#"\x7B}\u{8} {"#, 1);
= note: if you intended to print `}`, you can escape it using `}}`
error: invalid format string: unmatched `}` found
--> $DIR/format-string-error-2.rs:85:21
--> $DIR/format-string-error-2.rs:84:21
|
LL | println!(r#"\x7B}\u8 {"#, 1);
| ^ unmatched `}` in format string

2
src/test/ui/issues/issue-28433.rs
View file

@ -1,5 +1,3 @@
enum Bird {
pub Duck,
//~^ ERROR unnecessary visibility qualifier

4
src/test/ui/issues/issue-28433.stderr
View file

@ -1,11 +1,11 @@
error: unnecessary visibility qualifier
--> $DIR/issue-28433.rs:4:5
--> $DIR/issue-28433.rs:2:5
|
LL | pub Duck,
| ^^^ `pub` not permitted here
error: unnecessary visibility qualifier
--> $DIR/issue-28433.rs:7:5
--> $DIR/issue-28433.rs:5:5
|
LL | pub(crate) Dove
| ^^^^^^^^^^ `pub` not permitted here

2
src/test/ui/issues/issue-36638.rs
View file

@ -1,5 +1,3 @@
struct Foo<Self>(Self);
//~^ ERROR expected identifier, found keyword `Self`
//~^^ ERROR E0392

6
src/test/ui/issues/issue-36638.stderr
View file

@ -1,17 +1,17 @@
error: expected identifier, found keyword `Self`
--> $DIR/issue-36638.rs:3:12
--> $DIR/issue-36638.rs:1:12
|
LL | struct Foo<Self>(Self);
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/issue-36638.rs:7:11
--> $DIR/issue-36638.rs:5:11
|
LL | trait Bar<Self> {}
| ^^^^ expected identifier, found keyword
error[E0392]: parameter `Self` is never used
--> $DIR/issue-36638.rs:3:12
--> $DIR/issue-36638.rs:1:12
|
LL | struct Foo<Self>(Self);
| ^^^^ unused parameter

2
src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs
View file

@ -1,5 +1,3 @@
// Test you can't use a higher-ranked trait bound inside of a qualified
// path (just won't parse).

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

@ -1,5 +1,5 @@
error: expected identifier, found keyword `for`
--> $DIR/associated-types-project-from-hrtb-explicit.rs:12:21
--> $DIR/associated-types-project-from-hrtb-explicit.rs:10:21
|
LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
| ^^^ expected identifier, found keyword
@ -9,7 +9,7 @@ LL | fn foo2<I>(x: <I as r#for<'x> Foo<&'x isize>>::A)
| ^^^^^
error: expected one of `::` or `>`, found `Foo`
--> $DIR/associated-types-project-from-hrtb-explicit.rs:12:29
--> $DIR/associated-types-project-from-hrtb-explicit.rs:10:29
|
LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
| ^^^ expected one of `::` or `>` here

3
src/test/ui/parser/bad-lit-suffixes.rs
View file

@ -1,6 +1,3 @@
extern
"C"suffix //~ ERROR suffixes on an ABI spec are invalid
fn foo() {}

32
src/test/ui/parser/bad-lit-suffixes.stderr
View file

@ -1,53 +1,53 @@
error: suffixes on an ABI spec are invalid
--> $DIR/bad-lit-suffixes.rs:5:5
--> $DIR/bad-lit-suffixes.rs:2:5
|
LL | "C"suffix
| ^^^^^^^^^ invalid suffix `suffix`
error: suffixes on an ABI spec are invalid
--> $DIR/bad-lit-suffixes.rs:9:5
--> $DIR/bad-lit-suffixes.rs:6:5
|
LL | "C"suffix
| ^^^^^^^^^ invalid suffix `suffix`
error: suffixes on a string literal are invalid
--> $DIR/bad-lit-suffixes.rs:13:5
--> $DIR/bad-lit-suffixes.rs:10:5
|
LL | ""suffix;
| ^^^^^^^^ invalid suffix `suffix`
error: suffixes on a byte string literal are invalid
--> $DIR/bad-lit-suffixes.rs:14:5
--> $DIR/bad-lit-suffixes.rs:11:5
|
LL | b""suffix;
| ^^^^^^^^^ invalid suffix `suffix`
error: suffixes on a string literal are invalid
--> $DIR/bad-lit-suffixes.rs:15:5
--> $DIR/bad-lit-suffixes.rs:12:5
|
LL | r#""#suffix;
| ^^^^^^^^^^^ invalid suffix `suffix`
error: suffixes on a byte string literal are invalid
--> $DIR/bad-lit-suffixes.rs:16:5
--> $DIR/bad-lit-suffixes.rs:13:5
|
LL | br#""#suffix;
| ^^^^^^^^^^^^ invalid suffix `suffix`
error: suffixes on a char literal are invalid
--> $DIR/bad-lit-suffixes.rs:17:5
--> $DIR/bad-lit-suffixes.rs:14:5
|
LL | 'a'suffix;
| ^^^^^^^^^ invalid suffix `suffix`
error: suffixes on a byte literal are invalid
--> $DIR/bad-lit-suffixes.rs:18:5
--> $DIR/bad-lit-suffixes.rs:15:5
|
LL | b'a'suffix;
| ^^^^^^^^^^ invalid suffix `suffix`
error: invalid width `1024` for integer literal
--> $DIR/bad-lit-suffixes.rs:20:5
--> $DIR/bad-lit-suffixes.rs:17:5
|
LL | 1234u1024;
| ^^^^^^^^^
@ -55,7 +55,7 @@ LL | 1234u1024;
= help: valid widths are 8, 16, 32, 64 and 128
error: invalid width `1024` for integer literal
--> $DIR/bad-lit-suffixes.rs:21:5
--> $DIR/bad-lit-suffixes.rs:18:5
|
LL | 1234i1024;
| ^^^^^^^^^
@ -63,7 +63,7 @@ LL | 1234i1024;
= help: valid widths are 8, 16, 32, 64 and 128
error: invalid width `1024` for float literal
--> $DIR/bad-lit-suffixes.rs:22:5
--> $DIR/bad-lit-suffixes.rs:19:5
|
LL | 1234f1024;
| ^^^^^^^^^
@ -71,7 +71,7 @@ LL | 1234f1024;
= help: valid widths are 32 and 64
error: invalid width `1024` for float literal
--> $DIR/bad-lit-suffixes.rs:23:5
--> $DIR/bad-lit-suffixes.rs:20:5
|
LL | 1234.5f1024;
| ^^^^^^^^^^^
@ -79,7 +79,7 @@ LL | 1234.5f1024;
= help: valid widths are 32 and 64
error: invalid suffix `suffix` for integer literal
--> $DIR/bad-lit-suffixes.rs:25:5
--> $DIR/bad-lit-suffixes.rs:22:5
|
LL | 1234suffix;
| ^^^^^^^^^^ invalid suffix `suffix`
@ -87,7 +87,7 @@ LL | 1234suffix;
= help: the suffix must be one of the integral types (`u32`, `isize`, etc)
error: invalid suffix `suffix` for integer literal
--> $DIR/bad-lit-suffixes.rs:26:5
--> $DIR/bad-lit-suffixes.rs:23:5
|
LL | 0b101suffix;
| ^^^^^^^^^^^ invalid suffix `suffix`
@ -95,7 +95,7 @@ LL | 0b101suffix;
= 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:27:5
--> $DIR/bad-lit-suffixes.rs:24:5
|
LL | 1.0suffix;
| ^^^^^^^^^ invalid suffix `suffix`
@ -103,7 +103,7 @@ LL | 1.0suffix;
= help: valid suffixes are `f32` and `f64`
error: invalid suffix `suffix` for float literal
--> $DIR/bad-lit-suffixes.rs:28:5
--> $DIR/bad-lit-suffixes.rs:25:5
|
LL | 1.0e10suffix;
| ^^^^^^^^^^^^ invalid suffix `suffix`

2
src/test/ui/parser/doc-after-struct-field.rs
View file

@ -1,5 +1,3 @@
struct X {
a: u8 /** document a */,
//~^ ERROR found a documentation comment that doesn't document anything

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

@ -1,5 +1,5 @@
error[E0585]: found a documentation comment that doesn't document anything
--> $DIR/doc-after-struct-field.rs:4:11
--> $DIR/doc-after-struct-field.rs:2:11
|
LL | a: u8 /** document a */,
| ^^^^^^^^^^^^^^^^^
@ -7,7 +7,7 @@ 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:10:11
--> $DIR/doc-after-struct-field.rs:8:11
|
LL | a: u8 /// document a
| ^^^^^^^^^^^^^^

2
src/test/ui/parser/doc-before-fn-rbrace.rs
View file

@ -1,5 +1,3 @@
fn main() {
/// document
//~^ ERROR found a documentation comment that doesn't document anything

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

@ -1,5 +1,5 @@
error[E0585]: found a documentation comment that doesn't document anything
--> $DIR/doc-before-fn-rbrace.rs:4:5
--> $DIR/doc-before-fn-rbrace.rs:2:5
|
LL | /// document
| ^^^^^^^^^^^^

2
src/test/ui/parser/doc-before-identifier.rs
View file

@ -1,5 +1,3 @@
fn /// document
foo() {}
//~^^ ERROR expected identifier, found doc comment `/// document`

2
src/test/ui/parser/doc-before-identifier.stderr
View file

@ -1,5 +1,5 @@
error: expected identifier, found doc comment `/// document`
--> $DIR/doc-before-identifier.rs:3:4
--> $DIR/doc-before-identifier.rs:1:4
|
LL | fn /// document
| ^^^^^^^^^^^^ expected identifier, found doc comment

2
src/test/ui/parser/doc-before-mod-rbrace.rs
View file

@ -1,5 +1,3 @@
mod Foo {
/// document
//~^ ERROR expected item after doc comment

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

@ -1,5 +1,5 @@
error: expected item after doc comment
--> $DIR/doc-before-mod-rbrace.rs:4:5
--> $DIR/doc-before-mod-rbrace.rs:2:5
|
LL | /// document
| ^^^^^^^^^^^^ this doc comment doesn't document anything

2
src/test/ui/parser/doc-before-struct-rbrace-1.rs
View file

@ -1,5 +1,3 @@
struct X {
a: u8,
/// document

2
src/test/ui/parser/doc-before-struct-rbrace-1.stderr
View file

@ -1,5 +1,5 @@
error[E0585]: found a documentation comment that doesn't document anything
--> $DIR/doc-before-struct-rbrace-1.rs:5:5
--> $DIR/doc-before-struct-rbrace-1.rs:3:5
|
LL | /// document
| ^^^^^^^^^^^^

2
src/test/ui/parser/doc-before-struct-rbrace-2.rs
View file

@ -1,5 +1,3 @@
struct X {
a: u8 /// document
//~^ ERROR found a documentation comment that doesn't document anything

2
src/test/ui/parser/doc-before-struct-rbrace-2.stderr
View file

@ -1,5 +1,5 @@
error[E0585]: found a documentation comment that doesn't document anything
--> $DIR/doc-before-struct-rbrace-2.rs:4:11
--> $DIR/doc-before-struct-rbrace-2.rs:2:11
|
LL | a: u8 /// document
| ^^^^^^^^^^^^

2
src/test/ui/parser/issue-17904-2.rs
View file

@ -1,5 +1,3 @@
struct Bar<T> { x: T } where T: Copy //~ ERROR expected item, found keyword `where`
fn main() {}

2
src/test/ui/parser/issue-17904-2.stderr
View file

@ -1,5 +1,5 @@
error: expected item, found keyword `where`
--> $DIR/issue-17904-2.rs:3:24
--> $DIR/issue-17904-2.rs:1:24
|
LL | struct Bar<T> { x: T } where T: Copy
| ^^^^^ expected item

2
src/test/ui/parser/issue-17904.rs
View file

@ -1,5 +1,3 @@
struct Baz<U> where U: Eq(U); //This is parsed as the new Fn* style parenthesis syntax.
struct Baz<U> where U: Eq(U) -> R; // Notice this parses as well.
struct Baz<U>(U) where U: Eq; // This rightfully signals no error as well.

2
src/test/ui/parser/issue-17904.stderr
View file

@ -1,5 +1,5 @@
error: expected one of `:`, `==`, or `=`, found `;`
--> $DIR/issue-17904.rs:6:33
--> $DIR/issue-17904.rs:4:33
|
LL | struct Foo<T> where T: Copy, (T);
| ^ expected one of `:`, `==`, or `=` here

2
src/test/ui/parser/issue-32214.rs
View file

@ -1,5 +1,3 @@
trait Trait<T> { type Item; }
pub fn test<W, I: Trait<Item=(), W> >() {}

2
src/test/ui/parser/issue-32214.stderr
View file

@ -1,5 +1,5 @@
error: associated type bindings must be declared after generic parameters
--> $DIR/issue-32214.rs:5:25
--> $DIR/issue-32214.rs:3:25
|
LL | pub fn test<W, I: Trait<Item=(), W> >() {}
| -------^^^

2
src/test/ui/parser/issue-32505.rs
View file

@ -1,5 +1,3 @@
pub fn test() {
foo(|_|) //~ ERROR expected expression, found `)`
}

2
src/test/ui/parser/issue-32505.stderr
View file

@ -1,5 +1,5 @@
error: expected expression, found `)`
--> $DIR/issue-32505.rs:4:12
--> $DIR/issue-32505.rs:2:12
|
LL | foo(|_|)
| ^ expected expression

2
src/test/ui/parser/lex-bad-binary-literal.rs
View file

@ -1,5 +1,3 @@
fn main() {
0b121; //~ ERROR invalid digit for a base 2 literal
0b10_10301; //~ ERROR invalid digit for a base 2 literal

18
src/test/ui/parser/lex-bad-binary-literal.stderr
View file

@ -1,53 +1,53 @@
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:4:8
--> $DIR/lex-bad-binary-literal.rs:2:8
|
LL | 0b121;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:5:12
--> $DIR/lex-bad-binary-literal.rs:3:12
|
LL | 0b10_10301;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:6:7
--> $DIR/lex-bad-binary-literal.rs:4:7
|
LL | 0b30;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:7:7
--> $DIR/lex-bad-binary-literal.rs:5:7
|
LL | 0b41;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:8:7
--> $DIR/lex-bad-binary-literal.rs:6:7
|
LL | 0b5;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:9:7
--> $DIR/lex-bad-binary-literal.rs:7:7
|
LL | 0b6;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:10:7
--> $DIR/lex-bad-binary-literal.rs:8:7
|
LL | 0b7;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:11:7
--> $DIR/lex-bad-binary-literal.rs:9:7
|
LL | 0b8;
| ^
error: invalid digit for a base 2 literal
--> $DIR/lex-bad-binary-literal.rs:12:7
--> $DIR/lex-bad-binary-literal.rs:10:7
|
LL | 0b9;
| ^

2
src/test/ui/parser/lex-bad-numeric-literals.rs
View file

@ -1,5 +1,3 @@
fn main() {
0o1.0; //~ ERROR: octal float literal is not supported
0o2f32; //~ ERROR: octal float literal is not supported

54
src/test/ui/parser/lex-bad-numeric-literals.stderr
View file

@ -1,137 +1,137 @@
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:4:5
--> $DIR/lex-bad-numeric-literals.rs:2:5
|
LL | 0o1.0;
| ^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:6:5
--> $DIR/lex-bad-numeric-literals.rs:4:5
|
LL | 0o3.0f32;
| ^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:7:5
--> $DIR/lex-bad-numeric-literals.rs:5:5
|
LL | 0o4e4;
| ^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:8:5
--> $DIR/lex-bad-numeric-literals.rs:6:5
|
LL | 0o5.0e5;
| ^^^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:9:5
--> $DIR/lex-bad-numeric-literals.rs:7:5
|
LL | 0o6e6f32;
| ^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:10:5
--> $DIR/lex-bad-numeric-literals.rs:8:5
|
LL | 0o7.0e7f64;
| ^^^^^^^
error: hexadecimal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:11:5
--> $DIR/lex-bad-numeric-literals.rs:9:5
|
LL | 0x8.0e+9;
| ^^^^^^^^
error: hexadecimal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:12:5
--> $DIR/lex-bad-numeric-literals.rs:10:5
|
LL | 0x9.0e-9;
| ^^^^^^^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:13:5
--> $DIR/lex-bad-numeric-literals.rs:11:5
|
LL | 0o;
| ^^
error: expected at least one digit in exponent
--> $DIR/lex-bad-numeric-literals.rs:14:8
--> $DIR/lex-bad-numeric-literals.rs:12:8
|
LL | 1e+;
| ^
error: hexadecimal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:15:5
--> $DIR/lex-bad-numeric-literals.rs:13:5
|
LL | 0x539.0;
| ^^^^^^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:20:5
--> $DIR/lex-bad-numeric-literals.rs:18:5
|
LL | 0x;
| ^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:21:5
--> $DIR/lex-bad-numeric-literals.rs:19:5
|
LL | 0xu32;
| ^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:22:5
--> $DIR/lex-bad-numeric-literals.rs:20:5
|
LL | 0ou32;
| ^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:23:5
--> $DIR/lex-bad-numeric-literals.rs:21:5
|
LL | 0bu32;
| ^^
error: no valid digits found for number
--> $DIR/lex-bad-numeric-literals.rs:24:5
--> $DIR/lex-bad-numeric-literals.rs:22:5
|
LL | 0b;
| ^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:26:5
--> $DIR/lex-bad-numeric-literals.rs:24:5
|
LL | 0o123.456;
| ^^^^^^^^^
error: binary float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:28:5
--> $DIR/lex-bad-numeric-literals.rs:26:5
|
LL | 0b111.101;
| ^^^^^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:5:5
--> $DIR/lex-bad-numeric-literals.rs:3:5
|
LL | 0o2f32;
| ^^^^^^ not supported
error: integer literal is too large
--> $DIR/lex-bad-numeric-literals.rs:14:5
|
LL | 9900000000000000000000000000999999999999999999999999999999;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: integer literal is too large
--> $DIR/lex-bad-numeric-literals.rs:16:5
|
LL | 9900000000000000000000000000999999999999999999999999999999;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: integer literal is too large
--> $DIR/lex-bad-numeric-literals.rs:18:5
|
LL | 9900000000000000000000000000999999999999999999999999999999;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: octal float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:25:5
--> $DIR/lex-bad-numeric-literals.rs:23:5
|
LL | 0o123f64;
| ^^^^^^^^ not supported
error: binary float literal is not supported
--> $DIR/lex-bad-numeric-literals.rs:27:5
--> $DIR/lex-bad-numeric-literals.rs:25:5
|
LL | 0b101f64;
| ^^^^^^^^ not supported

2
src/test/ui/parser/lex-bad-octal-literal.rs
View file

@ -1,5 +1,3 @@
fn main() {
0o18; //~ ERROR invalid digit for a base 8 literal
0o1234_9_5670; //~ ERROR invalid digit for a base 8 literal

4
src/test/ui/parser/lex-bad-octal-literal.stderr
View file

@ -1,11 +1,11 @@
error: invalid digit for a base 8 literal
--> $DIR/lex-bad-octal-literal.rs:4:8
--> $DIR/lex-bad-octal-literal.rs:2:8
|
LL | 0o18;
| ^
error: invalid digit for a base 8 literal
--> $DIR/lex-bad-octal-literal.rs:5:12
--> $DIR/lex-bad-octal-literal.rs:3:12
|
LL | 0o1234_9_5670;
| ^

2
src/test/ui/parser/macro/macro-incomplete-parse.rs
View file

@ -1,5 +1,3 @@
macro_rules! ignored_item {
() => {
fn foo() {}

6
src/test/ui/parser/macro/macro-incomplete-parse.stderr
View file

@ -1,5 +1,5 @@
error: macro expansion ignores token `,` and any following
--> $DIR/macro-incomplete-parse.rs:7:9
--> $DIR/macro-incomplete-parse.rs:5:9
|
LL | ,
| ^
@ -10,7 +10,7 @@ LL | ignored_item!();
= note: the usage of `ignored_item!` is likely invalid in item context
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
--> $DIR/macro-incomplete-parse.rs:12:14
--> $DIR/macro-incomplete-parse.rs:10:14
|
LL | () => ( 1,
| ^ expected one of `.`, `;`, `?`, `}`, or an operator here
@ -19,7 +19,7 @@ LL | ignored_expr!();
| ---------------- in this macro invocation
error: macro expansion ignores token `,` and any following
--> $DIR/macro-incomplete-parse.rs:18:14
--> $DIR/macro-incomplete-parse.rs:16:14
|
LL | () => ( 1, 2 )
| ^

2
src/test/ui/parser/new-unicode-escapes-4.rs
View file

@ -1,5 +1,3 @@
pub fn main() {
let s = "\u{lol}";
//~^ ERROR invalid character in unicode escape: l

2
src/test/ui/parser/new-unicode-escapes-4.stderr
View file

@ -1,5 +1,5 @@
error: invalid character in unicode escape: l
--> $DIR/new-unicode-escapes-4.rs:4:17
--> $DIR/new-unicode-escapes-4.rs:2:17
|
LL | let s = "\u{lol}";
| ^

2
src/test/ui/parser/no-unsafe-self.rs
View file

@ -1,5 +1,3 @@
trait A {
fn foo(*mut self); //~ ERROR cannot pass `self` by raw pointer
fn baz(*const self); //~ ERROR cannot pass `self` by raw pointer

12
src/test/ui/parser/no-unsafe-self.stderr
View file

@ -1,35 +1,35 @@
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:4:17
--> $DIR/no-unsafe-self.rs:2:17
|
LL | fn foo(*mut self);
| ^^^^ cannot pass `self` by raw pointer
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:5:19
--> $DIR/no-unsafe-self.rs:3:19
|
LL | fn baz(*const self);
| ^^^^ cannot pass `self` by raw pointer
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:6:13
--> $DIR/no-unsafe-self.rs:4:13
|
LL | fn bar(*self);
| ^^^^ cannot pass `self` by raw pointer
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:11:17
--> $DIR/no-unsafe-self.rs:9:17
|
LL | fn foo(*mut self) { }
| ^^^^ cannot pass `self` by raw pointer
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:12:19
--> $DIR/no-unsafe-self.rs:10:19
|
LL | fn baz(*const self) { }
| ^^^^ cannot pass `self` by raw pointer
error: cannot pass `self` by raw pointer
--> $DIR/no-unsafe-self.rs:13:13
--> $DIR/no-unsafe-self.rs:11:13
|
LL | fn bar(*self) { }
| ^^^^ cannot pass `self` by raw pointer

2
src/test/ui/parser/range_inclusive_dotdotdot.rs
View file

@ -1,5 +1,3 @@
// Make sure that inclusive ranges with `...` syntax don't parse.
use std::ops::RangeToInclusive;

8
src/test/ui/parser/range_inclusive_dotdotdot.stderr
View file

@ -1,5 +1,5 @@
error: unexpected token: `...`
--> $DIR/range_inclusive_dotdotdot.rs:8:12
--> $DIR/range_inclusive_dotdotdot.rs:6:12
|
LL | return ...1;
| ^^^
@ -13,7 +13,7 @@ LL | return ..=1;
| ^^^
error: unexpected token: `...`
--> $DIR/range_inclusive_dotdotdot.rs:14:13
--> $DIR/range_inclusive_dotdotdot.rs:12:13
|
LL | let x = ...0;
| ^^^
@ -27,7 +27,7 @@ LL | let x = ..=0;
| ^^^
error: unexpected token: `...`
--> $DIR/range_inclusive_dotdotdot.rs:18:14
--> $DIR/range_inclusive_dotdotdot.rs:16:14
|
LL | let x = 5...5;
| ^^^
@ -41,7 +41,7 @@ LL | let x = 5..=5;
| ^^^
error: unexpected token: `...`
--> $DIR/range_inclusive_dotdotdot.rs:22:15
--> $DIR/range_inclusive_dotdotdot.rs:20:15
|
LL | for _ in 0...1 {}
| ^^^

3
src/test/ui/parser/raw-byte-string-literals.rs
View file

@ -1,6 +1,3 @@
pub fn main() {
br"é"; //~ ERROR raw byte string must be ASCII
br##~"a"~##; //~ ERROR only `#` is allowed in raw string delimitation

4
src/test/ui/parser/raw-byte-string-literals.stderr
View file

@ -1,11 +1,11 @@
error: raw byte string must be ASCII: \u{e9}
--> $DIR/raw-byte-string-literals.rs:5:8
--> $DIR/raw-byte-string-literals.rs:2:8
|
LL | br"é";
| ^
error: found invalid character; only `#` is allowed in raw string delimitation: ~
--> $DIR/raw-byte-string-literals.rs:6:6
--> $DIR/raw-byte-string-literals.rs:3:6
|
LL | br##~"a"~##;
| ^^^

2
src/test/ui/parser/recover-enum.rs
View file

@ -1,5 +1,3 @@
fn main() {
enum Test {
Very

6
src/test/ui/parser/recover-enum.stderr
View file

@ -1,17 +1,17 @@
error: missing comma
--> $DIR/recover-enum.rs:5:13
--> $DIR/recover-enum.rs:3:13
|
LL | Very
| ^ help: missing comma
error: missing comma
--> $DIR/recover-enum.rs:7:19
--> $DIR/recover-enum.rs:5:19
|
LL | Bad(usize)
| ^ help: missing comma
error: missing comma
--> $DIR/recover-enum.rs:9:27
--> $DIR/recover-enum.rs:7:27
|
LL | Stuff { a: usize }
| ^ help: missing comma

2
src/test/ui/parser/recover-enum2.rs
View file

@ -1,5 +1,3 @@
fn main() {
enum Test {
Var1,

4
src/test/ui/parser/recover-enum2.stderr
View file

@ -1,11 +1,11 @@
error: expected type, found `{`
--> $DIR/recover-enum2.rs:8:18
--> $DIR/recover-enum2.rs:6:18
|
LL | abc: {},
| ^
error: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `{`
--> $DIR/recover-enum2.rs:27:22
--> $DIR/recover-enum2.rs:25:22
|
LL | Nope(i32 {})
| ^ expected one of 7 possible tokens here

2
src/test/ui/parser/recover-struct.rs
View file

@ -1,5 +1,3 @@
fn main() {
struct Test {
Very

2
src/test/ui/parser/recover-struct.stderr
View file

@ -1,5 +1,5 @@
error: expected `:`, found `Bad`
--> $DIR/recover-struct.rs:6:9
--> $DIR/recover-struct.rs:4:9
|
LL | Very
| - expected `:`

2
src/test/ui/parser/removed-syntax-field-let.rs
View file

@ -1,5 +1,3 @@
struct S {
let foo: (),
//~^ ERROR expected identifier, found keyword `let`

4
src/test/ui/parser/removed-syntax-field-let.stderr
View file

@ -1,5 +1,5 @@
error: expected identifier, found keyword `let`
--> $DIR/removed-syntax-field-let.rs:4:5
--> $DIR/removed-syntax-field-let.rs:2:5
|
LL | let foo: (),
| ^^^ expected identifier, found keyword
@ -9,7 +9,7 @@ LL | r#let foo: (),
| ^^^^^
error: expected `:`, found `foo`
--> $DIR/removed-syntax-field-let.rs:4:9
--> $DIR/removed-syntax-field-let.rs:2:9
|
LL | let foo: (),
| ^^^ expected `:`

1
src/test/ui/parser/trailing-plus-in-bounds.rs
View file

@ -1,6 +1,5 @@
// compile-pass
#![feature(box_syntax)]
#![allow(bare_trait_objects)]

8
src/test/ui/parser/trait-bounds-not-on-impl.rs
View file

@ -1,11 +1,7 @@
trait Foo {
}
trait Foo {}
struct Bar;
impl Foo + Owned for Bar { //~ ERROR expected a trait, found type
}
impl Foo + Owned for Bar {} //~ ERROR expected a trait, found type
fn main() { }

4
src/test/ui/parser/trait-bounds-not-on-impl.stderr
View file

@ -1,7 +1,7 @@
error: expected a trait, found type
--> $DIR/trait-bounds-not-on-impl.rs:8:6
--> $DIR/trait-bounds-not-on-impl.rs:5:6
|
LL | impl Foo + Owned for Bar {
LL | impl Foo + Owned for Bar {}
| ^^^^^^^^^^^
error: aborting due to previous error

2
src/test/ui/parser/trait-object-bad-parens.rs
View file

@ -1,5 +1,3 @@
#![feature(optin_builtin_traits)]
#![allow(bare_trait_objects)]

8
src/test/ui/parser/trait-object-bad-parens.stderr
View file

@ -1,23 +1,23 @@
error[E0178]: expected a path on the left-hand side of `+`, not `((Auto))`
--> $DIR/trait-object-bad-parens.rs:9:16
--> $DIR/trait-object-bad-parens.rs:7:16
|
LL | let _: Box<((Auto)) + Auto>;
| ^^^^^^^^^^^^^^^ expected a path
error[E0178]: expected a path on the left-hand side of `+`, not `(Auto + Auto)`
--> $DIR/trait-object-bad-parens.rs:11:16
--> $DIR/trait-object-bad-parens.rs:9:16
|
LL | let _: Box<(Auto + Auto) + Auto>;
| ^^^^^^^^^^^^^^^^^^^^ expected a path
error[E0178]: expected a path on the left-hand side of `+`, not `(Auto)`
--> $DIR/trait-object-bad-parens.rs:13:16
--> $DIR/trait-object-bad-parens.rs:11:16
|
LL | let _: Box<(Auto +) + Auto>;
| ^^^^^^^^^^^^^^^ expected a path
error[E0178]: expected a path on the left-hand side of `+`, not `(dyn Auto)`
--> $DIR/trait-object-bad-parens.rs:15:16
--> $DIR/trait-object-bad-parens.rs:13:16
|
LL | let _: Box<(dyn Auto) + Auto>;
| ^^^^^^^^^^^^^^^^^ expected a path

2
src/test/ui/parser/trait-object-lifetime-parens.rs
View file

@ -1,5 +1,3 @@
#![allow(bare_trait_objects)]
trait Trait {}

10
src/test/ui/parser/trait-object-lifetime-parens.stderr
View file

@ -1,23 +1,23 @@
error: parenthesized lifetime bounds are not supported
--> $DIR/trait-object-lifetime-parens.rs:7:21
--> $DIR/trait-object-lifetime-parens.rs:5:21
|
LL | fn f<'a, T: Trait + ('a)>() {}
| ^^^^ help: remove the parentheses
error: parenthesized lifetime bounds are not supported
--> $DIR/trait-object-lifetime-parens.rs:10:24
--> $DIR/trait-object-lifetime-parens.rs:8:24
|
LL | let _: Box<Trait + ('a)>;
| ^^^^ help: remove the parentheses
error: expected `:`, found `)`
--> $DIR/trait-object-lifetime-parens.rs:11:19
--> $DIR/trait-object-lifetime-parens.rs:9:19
|
LL | let _: Box<('a) + Trait>;
| ^ expected `:`
error: chained comparison operators require parentheses
--> $DIR/trait-object-lifetime-parens.rs:11:15
--> $DIR/trait-object-lifetime-parens.rs:9:15
|
LL | let _: Box<('a) + Trait>;
| ^^^^^^^^^^^^^^^
@ -26,7 +26,7 @@ LL | let _: Box<('a) + Trait>;
= help: or use `(...)` if you meant to specify fn arguments
error: expected type, found `'a`
--> $DIR/trait-object-lifetime-parens.rs:11:17
--> $DIR/trait-object-lifetime-parens.rs:9:17
|
LL | let _: Box<('a) + Trait>;
| - ^^

2
src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs
View file

@ -1,4 +1,2 @@
use std::any:: as foo; //~ ERROR expected identifier, found keyword `as`
//~^ ERROR: expected one of `::`, `;`, or `as`, found `foo`

4
src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
View file

@ -1,5 +1,5 @@
error: expected identifier, found keyword `as`
--> $DIR/use-as-where-use-ends-with-mod-sep.rs:3:16
--> $DIR/use-as-where-use-ends-with-mod-sep.rs:1:16
|
LL | use std::any:: as foo;
| ^^ expected identifier, found keyword
@ -9,7 +9,7 @@ LL | use std::any:: r#as foo;
| ^^^^
error: expected one of `::`, `;`, or `as`, found `foo`
--> $DIR/use-as-where-use-ends-with-mod-sep.rs:3:19
--> $DIR/use-as-where-use-ends-with-mod-sep.rs:1:19
|
LL | use std::any:: as foo;
| ^^^ expected one of `::`, `;`, or `as` here

2
src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs
View file

@ -1,5 +1,3 @@
// Empty predicate list is OK
fn equal1<T>(_: &T, _: &T) -> bool where {
true

2
src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr
View file

@ -1,5 +1,5 @@
error: expected `:`, found `{`
--> $DIR/where-clauses-no-bounds-or-predicates.rs:13:23
--> $DIR/where-clauses-no-bounds-or-predicates.rs:11:23
|
LL | fn foo<'a>() where 'a {}
| ^ expected `:`

2
src/test/ui/self/self_type_keyword.rs
View file

@ -1,5 +1,3 @@
mod foo {
struct Self;
//~^ ERROR expected identifier, found keyword `Self`

22
src/test/ui/self/self_type_keyword.stderr
View file

@ -1,65 +1,65 @@
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:4:10
--> $DIR/self_type_keyword.rs:2:10
|
LL | struct Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:16:13
--> $DIR/self_type_keyword.rs:14:13
|
LL | ref Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:18:13
--> $DIR/self_type_keyword.rs:16:13
|
LL | mut Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:20:17
--> $DIR/self_type_keyword.rs:18:17
|
LL | ref mut Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:24:15
--> $DIR/self_type_keyword.rs:22:15
|
LL | Foo { Self } => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:30:26
--> $DIR/self_type_keyword.rs:28:26
|
LL | extern crate core as Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:35:32
--> $DIR/self_type_keyword.rs:33:32
|
LL | use std::option::Option as Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:40:11
--> $DIR/self_type_keyword.rs:38:11
|
LL | trait Self {}
| ^^^^ expected identifier, found keyword
error: lifetimes cannot use keyword names
--> $DIR/self_type_keyword.rs:8:12
--> $DIR/self_type_keyword.rs:6:12
|
LL | struct Bar<'Self>;
| ^^^^^
error: cannot find macro `Self!` in this scope
--> $DIR/self_type_keyword.rs:22:9
--> $DIR/self_type_keyword.rs:20:9
|
LL | Self!() => (),
| ^^^^
error[E0392]: parameter `'Self` is never used
--> $DIR/self_type_keyword.rs:8:12
--> $DIR/self_type_keyword.rs:6:12
|
LL | struct Bar<'Self>;
| ^^^^^ unused parameter

2
src/test/ui/traits/trait-object-vs-lifetime-2.rs
View file

@ -1,8 +1,6 @@
// A few contrived examples where lifetime should (or should not) be parsed as an object type.
// Lifetimes parsed as types are still rejected later by semantic checks.
// `'static` is a lifetime, `'static +` is a type, `'a` is a type
fn g() where
'static: 'static,

2
src/test/ui/traits/trait-object-vs-lifetime-2.stderr
View file

@ -1,5 +1,5 @@
error[E0224]: at least one non-builtin trait is required for an object type
--> $DIR/trait-object-vs-lifetime-2.rs:9:5
--> $DIR/trait-object-vs-lifetime-2.rs:7:5
|
LL | dyn 'static +: 'static + Copy,
| ^^^^^^^^^^^^^