From 02d25ab60d2701ce71fe2dfaca36627ad902e229 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Thu, 17 Jun 2021 18:09:44 +0200 Subject: Fix parser tests for 1.53 --- .../test_data/lexer/err/0001_unclosed_char_at_eof.txt | 4 ++-- .../lexer/err/0002_unclosed_char_with_ferris.txt | 4 ++-- .../lexer/err/0003_unclosed_char_with_ascii_escape.txt | 4 ++-- .../lexer/err/0004_unclosed_char_with_unicode_escape.txt | 4 ++-- .../lexer/err/0005_unclosed_char_with_space.txt | 4 ++-- .../lexer/err/0006_unclosed_char_with_slash.txt | 4 ++-- .../lexer/err/0007_unclosed_char_with_slash_n.txt | 4 ++-- .../err/0008_unclosed_char_with_slash_single_quote.txt | 4 ++-- .../test_data/lexer/err/0009_unclosed_byte_at_eof.txt | 4 ++-- .../lexer/err/0010_unclosed_byte_with_ferris.txt | 4 ++-- .../lexer/err/0011_unclosed_byte_with_ascii_escape.txt | 4 ++-- .../lexer/err/0012_unclosed_byte_with_unicode_escape.txt | 4 ++-- .../lexer/err/0013_unclosed_byte_with_space.txt | 4 ++-- .../lexer/err/0014_unclosed_byte_with_slash.txt | 4 ++-- .../lexer/err/0015_unclosed_byte_with_slash_n.txt | 4 ++-- .../err/0016_unclosed_byte_with_slash_single_quote.txt | 4 ++-- .../lexer/err/0057_lifetime_starts_with_a_number.txt | 8 ++++---- crates/syntax/test_data/lexer/ok/0006_chars.txt | 16 ++++++++-------- crates/syntax/test_data/lexer/ok/0007_lifetimes.txt | 8 ++++---- crates/syntax/test_data/lexer/ok/0008_byte_strings.txt | 14 +++++++------- 20 files changed, 55 insertions(+), 55 deletions(-) (limited to 'crates/syntax/test_data/lexer') diff --git a/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt index 4d5ad74df..135f49552 100644 --- a/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt +++ b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt @@ -1,2 +1,2 @@ -CHAR 1 "\'" -> error0..1 token("\'") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 1 "'" +> error0..1 token("'") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt index eafdb3c7c..cc3933d95 100644 --- a/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt +++ b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt @@ -1,2 +1,2 @@ -CHAR 5 "\'🦀" -> error0..5 token("\'🦀") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 5 "'🦀" +> error0..5 token("'🦀") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt index cc2b4866a..21d990e6f 100644 --- a/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt +++ b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt @@ -1,2 +1,2 @@ -CHAR 5 "\'\\x7f" -> error0..5 token("\'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 5 "'\\x7f" +> error0..5 token("'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt index a6d422cb3..055dba64c 100644 --- a/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt +++ b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt @@ -1,2 +1,2 @@ -CHAR 9 "\'\\u{20AA}" -> error0..9 token("\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 9 "'\\u{20AA}" +> error0..9 token("'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt index 47e7baa70..9ee5e93fa 100644 --- a/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt +++ b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt @@ -1,2 +1,2 @@ -CHAR 2 "\' " -> error0..2 token("\' ") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 2 "' " +> error0..2 token("' ") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt index 511029d80..dc3a596f6 100644 --- a/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt +++ b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt @@ -1,2 +1,2 @@ -CHAR 2 "\'\\" -> error0..2 token("\'\\") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 2 "'\\" +> error0..2 token("'\\") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt index d2ba5742c..e46edea98 100644 --- a/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt +++ b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt @@ -1,2 +1,2 @@ -CHAR 3 "\'\\n" -> error0..3 token("\'\\n") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 3 "'\\n" +> error0..3 token("'\\n") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt index ae9a7f0e2..8ad1e913a 100644 --- a/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt +++ b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt @@ -1,2 +1,2 @@ -CHAR 3 "\'\\\'" -> error0..3 token("\'\\\'") msg(Missing trailing `'` symbol to terminate the character literal) +CHAR 3 "'\\'" +> error0..3 token("'\\'") msg(Missing trailing `'` symbol to terminate the character literal) diff --git a/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt index ff1504592..9d30c7466 100644 --- a/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt +++ b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt @@ -1,2 +1,2 @@ -BYTE 2 "b\'" -> error0..2 token("b\'") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 2 "b'" +> error0..2 token("b'") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt index 34f7bd6d4..9dbf4203e 100644 --- a/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt +++ b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt @@ -1,2 +1,2 @@ -BYTE 6 "b\'🦀" -> error0..6 token("b\'🦀") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 6 "b'🦀" +> error0..6 token("b'🦀") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt index c964d0f00..d5d9c2ef7 100644 --- a/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt +++ b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt @@ -1,2 +1,2 @@ -BYTE 6 "b\'\\x7f" -> error0..6 token("b\'\\x7f") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 6 "b'\\x7f" +> error0..6 token("b'\\x7f") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt index cc65fb86f..a99b9666a 100644 --- a/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt +++ b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt @@ -1,2 +1,2 @@ -BYTE 10 "b\'\\u{20AA}" -> error0..10 token("b\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 10 "b'\\u{20AA}" +> error0..10 token("b'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt index 800834a14..8a344f712 100644 --- a/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt +++ b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt @@ -1,2 +1,2 @@ -BYTE 3 "b\' " -> error0..3 token("b\' ") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 3 "b' " +> error0..3 token("b' ") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt index 7b85ee646..b78a43c02 100644 --- a/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt +++ b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt @@ -1,2 +1,2 @@ -BYTE 3 "b\'\\" -> error0..3 token("b\'\\") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 3 "b'\\" +> error0..3 token("b'\\") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt index 4b9a63117..5147363ba 100644 --- a/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt +++ b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt @@ -1,2 +1,2 @@ -BYTE 4 "b\'\\n" -> error0..4 token("b\'\\n") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 4 "b'\\n" +> error0..4 token("b'\\n") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt index fe337f8d3..261c0894f 100644 --- a/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt +++ b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt @@ -1,2 +1,2 @@ -BYTE 4 "b\'\\\'" -> error0..4 token("b\'\\\'") msg(Missing trailing `'` symbol to terminate the byte literal) +BYTE 4 "b'\\'" +> error0..4 token("b'\\'") msg(Missing trailing `'` symbol to terminate the byte literal) diff --git a/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt b/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt index 11e0ae14a..b746404d2 100644 --- a/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt +++ b/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt @@ -1,6 +1,6 @@ -LIFETIME_IDENT 2 "\'1" +LIFETIME_IDENT 2 "'1" WHITESPACE 1 "\n" -LIFETIME_IDENT 10 "\'1lifetime" +LIFETIME_IDENT 10 "'1lifetime" WHITESPACE 1 "\n" -> error0..2 token("\'1") msg(Lifetime name cannot start with a number) -> error3..13 token("\'1lifetime") msg(Lifetime name cannot start with a number) +> error0..2 token("'1") msg(Lifetime name cannot start with a number) +> error3..13 token("'1lifetime") msg(Lifetime name cannot start with a number) diff --git a/crates/syntax/test_data/lexer/ok/0006_chars.txt b/crates/syntax/test_data/lexer/ok/0006_chars.txt index 950954fbc..756477dc9 100644 --- a/crates/syntax/test_data/lexer/ok/0006_chars.txt +++ b/crates/syntax/test_data/lexer/ok/0006_chars.txt @@ -1,16 +1,16 @@ -CHAR 3 "\'x\'" +CHAR 3 "'x'" WHITESPACE 1 " " -CHAR 3 "\' \'" +CHAR 3 "' '" WHITESPACE 1 " " -CHAR 3 "\'0\'" +CHAR 3 "'0'" WHITESPACE 1 " " -CHAR 7 "\'hello\'" +CHAR 7 "'hello'" WHITESPACE 1 " " -CHAR 6 "\'\\x7f\'" +CHAR 6 "'\\x7f'" WHITESPACE 1 " " -CHAR 4 "\'\\n\'" +CHAR 4 "'\\n'" WHITESPACE 1 " " -CHAR 4 "\'\\\\\'" +CHAR 4 "'\\\\'" WHITESPACE 1 " " -CHAR 4 "\'\\\'\'" +CHAR 4 "'\\''" WHITESPACE 1 "\n" diff --git a/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt index 4d6625c3a..32ed9ed50 100644 --- a/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt +++ b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt @@ -1,8 +1,8 @@ -LIFETIME_IDENT 2 "\'a" +LIFETIME_IDENT 2 "'a" WHITESPACE 1 " " -LIFETIME_IDENT 4 "\'foo" +LIFETIME_IDENT 4 "'foo" WHITESPACE 1 " " -LIFETIME_IDENT 12 "\'foo_bar_baz" +LIFETIME_IDENT 12 "'foo_bar_baz" WHITESPACE 1 " " -LIFETIME_IDENT 2 "\'_" +LIFETIME_IDENT 2 "'_" WHITESPACE 1 "\n" diff --git a/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt index e61ad99be..06d6bdd1f 100644 --- a/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt +++ b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt @@ -1,22 +1,22 @@ -BYTE 3 "b\'\'" +BYTE 3 "b''" WHITESPACE 1 " " -BYTE 4 "b\'x\'" +BYTE 4 "b'x'" WHITESPACE 1 " " BYTE_STRING 6 "b\"foo\"" WHITESPACE 1 " " BYTE_STRING 4 "br\"\"" WHITESPACE 1 "\n" -BYTE 6 "b\'\'suf" +BYTE 6 "b''suf" WHITESPACE 1 " " BYTE_STRING 5 "b\"\"ix" WHITESPACE 1 " " BYTE_STRING 6 "br\"\"br" WHITESPACE 1 "\n" -BYTE 5 "b\'\\n\'" +BYTE 5 "b'\\n'" WHITESPACE 1 " " -BYTE 5 "b\'\\\\\'" +BYTE 5 "b'\\\\'" WHITESPACE 1 " " -BYTE 5 "b\'\\\'\'" +BYTE 5 "b'\\''" WHITESPACE 1 " " -BYTE 8 "b\'hello\'" +BYTE 8 "b'hello'" WHITESPACE 1 "\n" -- cgit v1.2.3