Skip to content
Permalink
Browse files

fix tidy

  • Loading branch information...
estebank committed May 31, 2019
1 parent 860dce7 commit d6ea6b972dd68dbfa03334d06edebb80482605dd
Showing with 138 additions and 210 deletions.
  1. +0 −1 src/test/ui/fmt/format-string-error-2.rs
  2. +18 −18 src/test/ui/fmt/format-string-error-2.stderr
  3. +0 −2 src/test/ui/issues/issue-28433.rs
  4. +2 −2 src/test/ui/issues/issue-28433.stderr
  5. +0 −2 src/test/ui/issues/issue-36638.rs
  6. +3 −3 src/test/ui/issues/issue-36638.stderr
  7. +0 −2 src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs
  8. +2 −2 src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr
  9. +0 −3 src/test/ui/parser/bad-lit-suffixes.rs
  10. +16 −16 src/test/ui/parser/bad-lit-suffixes.stderr
  11. +0 −2 src/test/ui/parser/doc-after-struct-field.rs
  12. +2 −2 src/test/ui/parser/doc-after-struct-field.stderr
  13. +0 −2 src/test/ui/parser/doc-before-fn-rbrace.rs
  14. +1 −1 src/test/ui/parser/doc-before-fn-rbrace.stderr
  15. +0 −2 src/test/ui/parser/doc-before-identifier.rs
  16. +1 −1 src/test/ui/parser/doc-before-identifier.stderr
  17. +0 −2 src/test/ui/parser/doc-before-mod-rbrace.rs
  18. +1 −1 src/test/ui/parser/doc-before-mod-rbrace.stderr
  19. +0 −2 src/test/ui/parser/doc-before-struct-rbrace-1.rs
  20. +1 −1 src/test/ui/parser/doc-before-struct-rbrace-1.stderr
  21. +0 −2 src/test/ui/parser/doc-before-struct-rbrace-2.rs
  22. +1 −1 src/test/ui/parser/doc-before-struct-rbrace-2.stderr
  23. +0 −2 src/test/ui/parser/issue-17904-2.rs
  24. +1 −1 src/test/ui/parser/issue-17904-2.stderr
  25. +0 −2 src/test/ui/parser/issue-17904.rs
  26. +1 −1 src/test/ui/parser/issue-17904.stderr
  27. +0 −2 src/test/ui/parser/issue-32214.rs
  28. +1 −1 src/test/ui/parser/issue-32214.stderr
  29. +0 −2 src/test/ui/parser/issue-32505.rs
  30. +1 −1 src/test/ui/parser/issue-32505.stderr
  31. +0 −2 src/test/ui/parser/lex-bad-binary-literal.rs
  32. +9 −9 src/test/ui/parser/lex-bad-binary-literal.stderr
  33. +0 −2 src/test/ui/parser/lex-bad-numeric-literals.rs
  34. +23 −23 src/test/ui/parser/lex-bad-numeric-literals.stderr
  35. +0 −2 src/test/ui/parser/lex-bad-octal-literal.rs
  36. +2 −2 src/test/ui/parser/lex-bad-octal-literal.stderr
  37. +0 −2 src/test/ui/parser/macro/macro-incomplete-parse.rs
  38. +3 −3 src/test/ui/parser/macro/macro-incomplete-parse.stderr
  39. +0 −2 src/test/ui/parser/new-unicode-escapes-4.rs
  40. +1 −1 src/test/ui/parser/new-unicode-escapes-4.stderr
  41. +0 −2 src/test/ui/parser/no-unsafe-self.rs
  42. +6 −6 src/test/ui/parser/no-unsafe-self.stderr
  43. +0 −2 src/test/ui/parser/range_inclusive_dotdotdot.rs
  44. +4 −4 src/test/ui/parser/range_inclusive_dotdotdot.stderr
  45. +0 −3 src/test/ui/parser/raw-byte-string-literals.rs
  46. +2 −2 src/test/ui/parser/raw-byte-string-literals.stderr
  47. +0 −2 src/test/ui/parser/recover-enum.rs
  48. +3 −3 src/test/ui/parser/recover-enum.stderr
  49. +0 −2 src/test/ui/parser/recover-enum2.rs
  50. +2 −2 src/test/ui/parser/recover-enum2.stderr
  51. +0 −2 src/test/ui/parser/recover-struct.rs
  52. +1 −1 src/test/ui/parser/recover-struct.stderr
  53. +0 −2 src/test/ui/parser/removed-syntax-field-let.rs
  54. +2 −2 src/test/ui/parser/removed-syntax-field-let.stderr
  55. +0 −1 src/test/ui/parser/trailing-plus-in-bounds.rs
  56. +2 −6 src/test/ui/parser/trait-bounds-not-on-impl.rs
  57. +2 −2 src/test/ui/parser/trait-bounds-not-on-impl.stderr
  58. +0 −2 src/test/ui/parser/trait-object-bad-parens.rs
  59. +4 −4 src/test/ui/parser/trait-object-bad-parens.stderr
  60. +0 −2 src/test/ui/parser/trait-object-lifetime-parens.rs
  61. +5 −5 src/test/ui/parser/trait-object-lifetime-parens.stderr
  62. +0 −2 src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs
  63. +2 −2 src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
  64. +0 −2 src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs
  65. +1 −1 src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr
  66. +0 −2 src/test/ui/self/self_type_keyword.rs
  67. +11 −11 src/test/ui/self/self_type_keyword.stderr
  68. +0 −2 src/test/ui/traits/trait-object-vs-lifetime-2.rs
  69. +1 −1 src/test/ui/traits/trait-object-vs-lifetime-2.stderr
@@ -1,4 +1,3 @@

// ignore-tidy-tab

fn main() {
@@ -1,13 +1,13 @@
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);
| ^^-
| |
| 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,15 +158,15 @@ 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
|
= 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
@@ -1,5 +1,3 @@


enum Bird {
pub Duck,
//~^ ERROR unnecessary visibility qualifier
@@ -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
@@ -1,5 +1,3 @@


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


// Test you can't use a higher-ranked trait bound inside of a qualified
// path (just won't parse).

@@ -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
@@ -1,6 +1,3 @@



extern
"C"suffix //~ ERROR suffixes on an ABI spec are invalid
fn foo() {}
@@ -1,109 +1,109 @@
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;
| ^^^^^^^^^
|
= 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;
| ^^^^^^^^^
|
= 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;
| ^^^^^^^^^
|
= 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;
| ^^^^^^^^^^^
|
= 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`
|
= 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`
|
= 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`
|
= 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`
@@ -1,5 +1,3 @@


struct X {
a: u8 /** document a */,
//~^ ERROR found a documentation comment that doesn't document anything
@@ -1,13 +1,13 @@
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 */,
| ^^^^^^^^^^^^^^^^^
|
= 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
| ^^^^^^^^^^^^^^
@@ -1,5 +1,3 @@


fn main() {
/// document
//~^ ERROR found a documentation comment that doesn't document anything
@@ -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
| ^^^^^^^^^^^^

0 comments on commit d6ea6b9

Please sign in to comment.
You can’t perform that action at this time.