tests: fix broken tests after upgrading the annotate-snippets crate.

VirusTotal · Dec 10, 2024 · 9818193 · 9818193
1 parent e1bb909
commit 9818193
Show file tree

Hide file tree

Showing 25 changed files with 75 additions and 49 deletions.
diff --git a/lib/src/compiler/tests/testdata/errors/1.out b/lib/src/compiler/tests/testdata/errors/1.out
@@ -5,7 +5,7 @@ error[E012]: duplicate rule `test`
   |      ---- note: `test` declared here for the first time
 2 |    condition: true
 3 | }
-4 | 
+4 |
 5 | rule test {
   |      ^^^^ duplicate declaration of `test`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/113.out b/lib/src/compiler/tests/testdata/errors/113.out
@@ -2,7 +2,8 @@ error[E019]: invalid modifier combination: `xor` `nocase`
  --> line:3:16
   |
 3 |     $a = "foo" xor nocase
-  |                ^^^ `xor` modifier used here
-  |                    ^^^^^^ `nocase` modifier used here
+  |                ^^^ ^^^^^^ `nocase` modifier used here
+  |                |
+  |                `xor` modifier used here
   |
   = note: these two modifiers can't be used together
diff --git a/lib/src/compiler/tests/testdata/errors/114.out b/lib/src/compiler/tests/testdata/errors/114.out
@@ -2,7 +2,8 @@ error[E019]: invalid modifier combination: `base64wide` `nocase`
  --> line:3:29
   |
 3 |     $a = "foo" nocase ascii base64wide
-  |                             ^^^^^^^^^^ `base64wide` modifier used here
-  |                ^^^^^^ `nocase` modifier used here
+  |                ^^^^^^       ^^^^^^^^^^ `base64wide` modifier used here
+  |                |
+  |                `nocase` modifier used here
   |
   = note: these two modifiers can't be used together
diff --git a/lib/src/compiler/tests/testdata/errors/128.out b/lib/src/compiler/tests/testdata/errors/128.out
@@ -2,7 +2,7 @@ error[E001]: syntax error
  --> line:1:1
   |
 1 | / /*/
-2 | | 
+2 | |
 3 | | rule test { condition: true }
   | |_____________________________^ expecting import statement or rule definition
   |
diff --git a/lib/src/compiler/tests/testdata/errors/2.out b/lib/src/compiler/tests/testdata/errors/2.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:3:4
   |
 3 |    "foo" == 2
-  |    ^^^^^ this expression is `string`
-  |             ^ this expression is `integer`
+  |    ^^^^^    ^ this expression is `integer`
+  |    |
+  |    this expression is `string`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/31.out b/lib/src/compiler/tests/testdata/errors/31.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:3:20
   |
 3 |     for 1 n in (1, 2, "3") : (
-  |                    ^ this expression is `integer`
-  |                       ^^^ this expression is `string`
+  |                    ^  ^^^ this expression is `string`
+  |                    |
+  |                    this expression is `integer`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/32.out b/lib/src/compiler/tests/testdata/errors/32.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:4:7
   |
 4 |       n == "3"
-  |       ^ this expression is `integer`
-  |            ^^^ this expression is `string`
+  |       ^    ^^^ this expression is `string`
+  |       |
+  |       this expression is `integer`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/33.out b/lib/src/compiler/tests/testdata/errors/33.out
@@ -2,6 +2,7 @@ error[E005]: assignment mismatch
  --> line:3:13
   |
 3 |     for all x,y in (0..10) : ( true )
-  |             ^^^ this expects 2 value(s)
-  |                    ^^^^^^^ this produces 1 value(s)
+  |             ^^^    ^^^^^^^ this produces 1 value(s)
+  |             |
+  |             this expects 2 value(s)
   |
diff --git a/lib/src/compiler/tests/testdata/errors/34.out b/lib/src/compiler/tests/testdata/errors/34.out
@@ -2,6 +2,7 @@ error[E005]: assignment mismatch
  --> line:3:13
   |
 3 |     for all x,y in (1, 2, 3) : ( true )
-  |             ^^^ this expects 2 value(s)
-  |                     ^^^^^^^ this produces 1 value(s)
+  |             ^^^     ^^^^^^^ this produces 1 value(s)
+  |             |
+  |             this expects 2 value(s)
   |
diff --git a/lib/src/compiler/tests/testdata/errors/42.out b/lib/src/compiler/tests/testdata/errors/42.out
@@ -2,6 +2,7 @@ error[E015]: mixing greedy and non-greedy quantifiers in regular expression
  --> line:3:15
   |
 3 |     $a = /a.*b.*?c/
-  |               ^^^ this is non-greedy
-  |            ^^ this is greedy
+  |            ^^ ^^^ this is non-greedy
+  |            |
+  |            this is greedy
   |
diff --git a/lib/src/compiler/tests/testdata/errors/46.out b/lib/src/compiler/tests/testdata/errors/46.out
@@ -2,6 +2,8 @@ error[E017]: `entrypoint` is unsupported
  --> line:3:5
   |
 3 |     entrypoint == 0x1000
-  |     ^^^^^^^^^^ the `entrypoint` keyword is not supported anymore
-  |     ---------- help: use `pe.entry_point` or `elf.entry_point` or `macho.entry_point`
+  |     ----------
+  |     |
+  |     the `entrypoint` keyword is not supported anymore
+  |     help: use `pe.entry_point` or `elf.entry_point` or `macho.entry_point`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/47.out b/lib/src/compiler/tests/testdata/errors/47.out
@@ -2,6 +2,7 @@ error[E005]: assignment mismatch
  --> line:4:13
   |
 4 |     for all x,y in test_proto2.array_int64 : ( true )
-  |             ^^^ this expects 2 value(s)
-  |                    ^^^^^^^^^^^^^^^^^^^^^^^ this produces 1 value(s)
+  |             ^^^    ^^^^^^^^^^^^^^^^^^^^^^^ this produces 1 value(s)
+  |             |
+  |             this expects 2 value(s)
   |
diff --git a/lib/src/compiler/tests/testdata/errors/48.out b/lib/src/compiler/tests/testdata/errors/48.out
@@ -2,6 +2,7 @@ error[E005]: assignment mismatch
  --> line:4:13
   |
 4 |     for all x in test_proto2.map_string_int64 : ( true )
-  |             ^ this expects 1 value(s)
-  |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this produces 2 value(s)
+  |             ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this produces 2 value(s)
+  |             |
+  |             this expects 1 value(s)
   |
diff --git a/lib/src/compiler/tests/testdata/errors/50.out b/lib/src/compiler/tests/testdata/errors/50.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:4:53
   |
 4 |     for all k,v in test_proto2.map_int64_string : ( k == "1" )
-  |                                                     ^ this expression is `integer`
-  |                                                          ^^^ this expression is `string`
+  |                                                     ^    ^^^ this expression is `string`
+  |                                                     |
+  |                                                     this expression is `integer`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/51.out b/lib/src/compiler/tests/testdata/errors/51.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:4:53
   |
 4 |     for all k,v in test_proto2.map_int64_string : ( v == 1 )
-  |                                                     ^ this expression is `string`
-  |                                                          ^ this expression is `integer`
+  |                                                     ^    ^ this expression is `integer`
+  |                                                     |
+  |                                                     this expression is `string`
   |
diff --git a/lib/src/compiler/tests/testdata/errors/52.out b/lib/src/compiler/tests/testdata/errors/52.out
@@ -2,6 +2,7 @@ error[E003]: mismatching types
  --> line:5:8
   |
 5 |        struct.nested_int64_zero == "0" 
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^ this expression is `integer`
-  |                                    ^^^ this expression is `string`
+  |        ^^^^^^^^^^^^^^^^^^^^^^^^    ^^^ this expression is `string`
+  |        |
+  |        this expression is `integer`
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/11.out b/lib/src/compiler/tests/testdata/warnings/11.out
@@ -2,6 +2,7 @@ warning[redundant_modifier]: redundant case-insensitive modifier
  --> line:3:15
   |
 3 |     $a = /foo/i nocase
-  |               - the `i` suffix indicates that the pattern is case-insensitive
-  |                 ------ the `nocase` modifier does the same
+  |               - ------ the `nocase` modifier does the same
+  |               |
+  |               the `i` suffix indicates that the pattern is case-insensitive
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/13.out b/lib/src/compiler/tests/testdata/warnings/13.out
@@ -1,5 +1,5 @@
 warning[duplicate_import]: duplicate import statement
- --> line:1:21
+ --> line:2:1
   |
 1 | import "test_proto2"
   | -------------------- note: `test_proto2` imported here for the first time

diff --git a/lib/src/compiler/tests/testdata/warnings/3.out b/lib/src/compiler/tests/testdata/warnings/3.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     all of them at 0
-  |     --- this implies that multiple patterns must match
-  |                 ---- but they must match at the same offset
+  |     ---         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/34.out b/lib/src/compiler/tests/testdata/warnings/34.out
@@ -2,13 +2,17 @@ warning[text_as_hex]: hex pattern could be written as text literal
  --> line:3:5
   |
 3 |     $aaa = { 61 61 61 }
-  |     ----------------- this pattern can be written as a text literal
-  |     ----------------- help: replace with "aaa"
+  |     -----------------
+  |     |
+  |     this pattern can be written as a text literal
+  |     help: replace with "aaa"
   |
 warning[text_as_hex]: hex pattern could be written as text literal
   --> line:10:5
    |
 10 |     $aaa = { 61 09 62 }
-   |     ----------------- this pattern can be written as a text literal
-   |     ----------------- help: replace with "a\tb"
+   |     -----------------
+   |     |
+   |     this pattern can be written as a text literal
+   |     help: replace with "a\tb"
    |
diff --git a/lib/src/compiler/tests/testdata/warnings/4.out b/lib/src/compiler/tests/testdata/warnings/4.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     all of ($*) at 0
-  |     --- this implies that multiple patterns must match
-  |                 ---- but they must match at the same offset
+  |     ---         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/5.out b/lib/src/compiler/tests/testdata/warnings/5.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     all of ($*) at 0
-  |     --- this implies that multiple patterns must match
-  |                 ---- but they must match at the same offset
+  |     ---         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/7.out b/lib/src/compiler/tests/testdata/warnings/7.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     all of them at 0
-  |     --- this implies that multiple patterns must match
-  |                 ---- but they must match at the same offset
+  |     ---         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/8.out b/lib/src/compiler/tests/testdata/warnings/8.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     all of ($*) at 0
-  |     --- this implies that multiple patterns must match
-  |                 ---- but they must match at the same offset
+  |     ---         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |
diff --git a/lib/src/compiler/tests/testdata/warnings/9.out b/lib/src/compiler/tests/testdata/warnings/9.out
@@ -2,6 +2,7 @@ warning[unsatisfiable_expr]: potentially unsatisfiable expression
  --> line:6:5
   |
 6 |     2 of ($*) at 0
-  |     - this implies that multiple patterns must match
-  |               ---- but they must match at the same offset
+  |     -         ---- but they must match at the same offset
+  |     |
+  |     this implies that multiple patterns must match
   |