Skip to content

Commit be71f41

Browse files
committed
Update tests for 1.71
1 parent 4fec76c commit be71f41

5 files changed

+6
-2
lines changed

rust/messages.py

+2
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,8 @@ def find_span_r(span, expansion=None):
10691069
not _is_external(window, span['file_name']) and \
10701070
not span['expansion']['macro_decl_name'].startswith('#['):
10711071
invoke_span, expansion = find_span_r(span)
1072+
# TODO: rustc now emits this in its text output in some cases.
1073+
# Consider trying to avoid the duplicate note.
10721074
add_additional(window, invoke_span, 'in this macro invocation', 'help')
10731075

10741076
if span['is_primary']:

rust/themes.py

-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ def add_fake(msg, text):
342342
}
343343

344344
def see_also(path):
345-
print(path)
346345
if path.endswith(':external'):
347346
return 'See Also (external):'
348347
else:

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

+1-1
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:7
9+
// ~MSG(>=1.20.0) See Primary: macro_expansion_inside_mod1.rs:8
1010
// ~MSG(>=1.20.0,<1.34.0-beta) See Primary: macro_expansion_inside_mod1.rs:7

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

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +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
1112
// ^^^^^^^^^^^^^^^^^^^^^MSG(>=1.44.0-beta) See Primary: lib.rs:20
1213
// ~ERR(>=1.20.0,<1.44.0-beta) /expected one of .*, found `:`/
1314
// ~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

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
macro_rules! example_bad_syntax {
33
() => {
44
enum E {
5+
// ^ERR(>=1.71.0-beta) while parsing this enum
56
// This is somewhat of an odd example, since rustc gives two
67
// syntax errors.
78
Kind(x: u32)
@@ -12,6 +13,7 @@ macro_rules! example_bad_syntax {
1213
// ^ERR(<1.34.0-beta) /expected one of .*, found `:`/
1314
// ^ERR(>=1.18.0,<1.34.0-beta) expected one of
1415
// ^MSG(>=1.20.0,<1.34.0-beta) See Also: macro-expansion-inside-1.rs:6
16+
// ^HELP(>=1.71.0-beta) enum variants can be
1517
}
1618
}
1719
}

0 commit comments

Comments
 (0)