Skip to content

Commit 561fe3b

Browse files
authored
Merge pull request #552 from ehuss/rust-1.98
Update messages for 1.98
2 parents 708f76a + e436e74 commit 561fe3b

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

‎tests/error-tests/tests/macro-expansion-inside-1.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ mod macro_expansion_inside_mod1;
66
/*BEGIN*/example_bad_syntax!{}/*END*/
77
// ~HELP(>=1.20.0) in this macro invocation
88
// ~HELP(>=1.20.0,<1.34.0-beta) in this macro invocation
9-
// ~MSG(>=1.20.0) See Primary: macro_expansion_inside_mod1.rs:11
10-
// ~MSG(>=1.20.0,<1.34.0-beta) See Primary: macro_expansion_inside_mod1.rs:11
9+
// ~MSG(>=1.20.0) See Primary: macro_expansion_inside_mod1.rs:12
10+
// ~MSG(>=1.20.0,<1.34.0-beta) See Primary: macro_expansion_inside_mod1.rs:12

‎tests/error-tests/tests/macro-expansion-outside-1.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern crate dcrate;
88

99
/*BEGIN*/example_bad_syntax!{}/*END*/
1010
// ^^^^^^^^^^^^^^^^^^^^^HELP(>=1.44.0-beta) in this macro invocation
11-
// ^^^^^^^^^^^^^^^^^^^^^ERR(>=1.71.0-beta) in this macro invocation
11+
// ^^^^^^^^^^^^^^^^^^^^^ERR(>=1.71.0-beta,<1.98.0-beta) in this macro invocation
1212
// ^^^^^^^^^^^^^^^^^^^^^MSG(>=1.44.0-beta) See Primary: lib.rs:20
1313
// ~ERR(>=1.20.0,<1.44.0-beta) /expected one of .*, found `:`/
1414
// ~ERR(>=1.20.0,<1.44.0-beta) this error originates in a macro outside of the current crate

‎tests/error-tests/tests/macro_expansion_inside_mod1.rs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ macro_rules! example_bad_syntax {
33
() => {
44
enum E {
55
// ^ERR(>=1.71.0-beta) while parsing this enum
6-
// ^^^^HELP(>=1.71.0-beta) perhaps you meant to use `struct` here
7-
// ^^^^HELP(>=1.71.0-beta) /Accept Replacement:.*/
8-
// ^^^^MSG(>=1.71.0-beta) See Primary: ↓:11
6+
// ^MSG(>=1.98.0-beta) See Primary: ↓:12
7+
// ^^^^HELP(>=1.71.0-beta,<1.98.0-beta) perhaps you meant to use `struct` here
8+
// ^^^^HELP(>=1.71.0-beta,<1.98.0-beta) /Accept Replacement:.*/
9+
// ^^^^MSG(>=1.71.0-beta,<1.98.0-beta) See Primary: ↓:12
910
// This is somewhat of an odd example, since rustc gives two
1011
// syntax errors.
1112
Kind(x: u32)
@@ -18,6 +19,12 @@ macro_rules! example_bad_syntax {
1819
// ^MSG(>=1.20.0,<1.34.0-beta) See Also: macro-expansion-inside-1.rs:6
1920
// ^HELP(>=1.71.0-beta) enum variants can be
2021
// ^MSG(>=1.71.0-beta) See Also: ↑:4
22+
// ^HELP(>=1.98.0-beta) if you meant to write
23+
// ^HELP(>=1.98.0-beta) /Accept Replacement:.*/
24+
// ^HELP(>=1.98.0-beta) if you meant to create
25+
// ^HELP(>=1.98.0-beta) /Accept Replacement:.*/
26+
// ^HELP(>=1.98.0-beta) if you meant to create
27+
// ^HELP(>=1.98.0-beta) /Accept Replacement:.*/
2128
}
2229
}
2330
}

0 commit comments

Comments
 (0)