Skip to content

Commit 27963a6

Browse files
committed
fixed diagnostics message
1 parent 374311b commit 27963a6

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

compiler/rustc_parse_format/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,9 @@ impl<'input> Parser<'input> {
858858
self.errors.insert(
859859
0,
860860
ParseError {
861-
description: "expected alignment specifier after `:` in format string; example: `{{:>?}}`".to_owned(),
861+
description:
862+
"expected alignment specifier after `:` in format string; example: `{:>?}`"
863+
.to_owned(),
862864
note: None,
863865
label: format!("expected `{}` to occur after `:`", alignment),
864866
span: range,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
22
// INVALID: alignment (`>18`) comes after `#X`, should be `:>#18X`
33
println!("{0:#X>18}", 12345);
4-
//~^ ERROR invalid format string: expected `>` (alignment specifier) after `:` in format string
4+
//~^ ERROR invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
55
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
error: invalid format string: expected `>` (alignment specifier) after `:` in format string; example: `{:>#X5}`
1+
error: invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
22
--> $DIR/format-alignment-hash.rs:3:20
33
|
44
LL | println!("{0:#X>18}", 12345);
55
| ^ expected `>` to occur after `:` in format string
6-
|
7-
= note: alignment must be one of `<` (left), `^` (center), or `>` (right)
86

97
error: aborting due to 1 previous error
108

tests/ui/fmt/format-string-wrong-order.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ fn main() {
1313
format!("{?:#?}", bar);
1414
//~^ ERROR invalid format string: expected format parameter to occur after `:`
1515
format!("Hello {<5:}!", "x");
16-
//~^ ERROR invalid format string: expected `<` (alignment specifier) after `:` in format string; example: `{:>#X5}`
16+
//~^ ERROR invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
1717
format!("Hello {^5:}!", "x");
18-
//~^ ERROR invalid format string: expected `^` (alignment specifier) after `:` in format string; example: `{:>#X5}`
18+
//~^ ERROR invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
1919
format!("Hello {>5:}!", "x");
20-
//~^ ERROR invalid format string: expected `>` (alignment specifier) after `:` in format string; example: `{:>#X5}`
20+
//~^ ERROR invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
2121
}

tests/ui/fmt/format-string-wrong-order.stderr

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,23 @@ LL | format!("{?:#?}", bar);
5050
|
5151
= note: `?` comes after `:`, try `:?` instead
5252

53-
error: invalid format string: expected `<` (alignment specifier) after `:` in format string; example: `{:>#X5}`
53+
error: invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
5454
--> $DIR/format-string-wrong-order.rs:15:21
5555
|
5656
LL | format!("Hello {<5:}!", "x");
5757
| ^ expected `<` to occur after `:` in format string
58-
|
59-
= note: alignment must be one of `<` (left), `^` (center), or `>` (right)
6058

61-
error: invalid format string: expected `^` (alignment specifier) after `:` in format string; example: `{:>#X5}`
59+
error: invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
6260
--> $DIR/format-string-wrong-order.rs:17:21
6361
|
6462
LL | format!("Hello {^5:}!", "x");
6563
| ^ expected `^` to occur after `:` in format string
66-
|
67-
= note: alignment must be one of `<` (left), `^` (center), or `>` (right)
6864

69-
error: invalid format string: expected `>` (alignment specifier) after `:` in format string; example: `{:>#X5}`
65+
error: invalid format string: expected alignment specifier after `:` in format string; example: `{:>?}`
7066
--> $DIR/format-string-wrong-order.rs:19:21
7167
|
7268
LL | format!("Hello {>5:}!", "x");
7369
| ^ expected `>` to occur after `:` in format string
74-
|
75-
= note: alignment must be one of `<` (left), `^` (center), or `>` (right)
7670

7771
error: aborting due to 9 previous errors
7872

0 commit comments

Comments
 (0)