From 86f85bb4693a9154a4fce46d30012444153704d3 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Sun, 6 Oct 2024 13:58:07 +0200
Subject: [PATCH] Rust: fix utf8 test

---
 .../ExtractionConsistency.expected            |  5 --
 .../ql/test/extractor-tests/utf8/ast.expected | 68 +++++++++----------
 ...tf8-identifiers.rs => utf8_identifiers.rs} |  0
 3 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
 rename rust/ql/test/extractor-tests/utf8/{utf8-identifiers.rs => utf8_identifiers.rs} (100%)

diff --git a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index 44971e7dcf366..0000000000000
--- a/rust/ql/test/extractor-tests/utf8/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| lib.rs:2:9:2:8 | expected `;` or `{` |
-| lib.rs:2:9:2:8 | expected an item |
-| lib.rs:2:10:2:21 | macro expansion failed: could not resolve macro 'identifiers' |
-| lib.rs:2:21:2:20 | expected BANG |
-| lib.rs:2:21:2:20 | expected `{`, `[`, `(` |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index 39fb19f1b04ec..b0a4dfe009120 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -1,37 +1,33 @@
 | lib.rs:1:1:2:22 | SourceFile |
-| lib.rs:2:1:2:8 | Module |
-| lib.rs:2:5:2:8 | Name |
-| lib.rs:2:10:2:20 | NameRef |
-| lib.rs:2:10:2:20 | Path |
-| lib.rs:2:10:2:20 | PathSegment |
-| lib.rs:2:10:2:21 | MacroCall |
-| utf8-identifiers.rs:1:1:4:6 | foo |
-| utf8-identifiers.rs:1:1:12:2 | SourceFile |
-| utf8-identifiers.rs:1:4:1:6 | Name |
-| utf8-identifiers.rs:1:7:4:1 | GenericParamList |
-| utf8-identifiers.rs:2:5:2:6 | Lifetime |
-| utf8-identifiers.rs:2:5:2:6 | LifetimeParam |
-| utf8-identifiers.rs:3:5:3:5 | Name |
-| utf8-identifiers.rs:3:5:3:5 | TypeParam |
-| utf8-identifiers.rs:4:2:4:3 | ParamList |
-| utf8-identifiers.rs:4:5:4:6 | BlockExpr |
-| utf8-identifiers.rs:4:5:4:6 | StmtList |
-| utf8-identifiers.rs:6:1:8:1 | Struct |
-| utf8-identifiers.rs:6:8:6:8 | Name |
-| utf8-identifiers.rs:6:10:8:1 | RecordFieldList |
-| utf8-identifiers.rs:7:5:7:5 | Name |
-| utf8-identifiers.rs:7:5:7:13 | RecordField |
-| utf8-identifiers.rs:7:9:7:13 | NameRef |
-| utf8-identifiers.rs:7:9:7:13 | Path |
-| utf8-identifiers.rs:7:9:7:13 | PathSegment |
-| utf8-identifiers.rs:7:9:7:13 | PathType |
-| utf8-identifiers.rs:10:1:10:3 | Visibility |
-| utf8-identifiers.rs:10:1:12:1 | main |
-| utf8-identifiers.rs:10:8:10:11 | Name |
-| utf8-identifiers.rs:10:12:10:13 | ParamList |
-| utf8-identifiers.rs:10:15:12:1 | BlockExpr |
-| utf8-identifiers.rs:10:15:12:1 | StmtList |
-| utf8-identifiers.rs:11:5:11:24 | LetStmt |
-| utf8-identifiers.rs:11:9:11:9 | Name |
-| utf8-identifiers.rs:11:9:11:9 | \u03b1 |
-| utf8-identifiers.rs:11:14:11:23 | 0.00001f64 |
+| lib.rs:2:1:2:21 | Module |
+| lib.rs:2:5:2:20 | Name |
+| utf8_identifiers.rs:1:1:4:6 | foo |
+| utf8_identifiers.rs:1:1:12:2 | SourceFile |
+| utf8_identifiers.rs:1:4:1:6 | Name |
+| utf8_identifiers.rs:1:7:4:1 | GenericParamList |
+| utf8_identifiers.rs:2:5:2:6 | Lifetime |
+| utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
+| utf8_identifiers.rs:3:5:3:5 | Name |
+| utf8_identifiers.rs:3:5:3:5 | TypeParam |
+| utf8_identifiers.rs:4:2:4:3 | ParamList |
+| utf8_identifiers.rs:4:5:4:6 | BlockExpr |
+| utf8_identifiers.rs:4:5:4:6 | StmtList |
+| utf8_identifiers.rs:6:1:8:1 | Struct |
+| utf8_identifiers.rs:6:8:6:8 | Name |
+| utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
+| utf8_identifiers.rs:7:5:7:5 | Name |
+| utf8_identifiers.rs:7:5:7:13 | RecordField |
+| utf8_identifiers.rs:7:9:7:13 | NameRef |
+| utf8_identifiers.rs:7:9:7:13 | Path |
+| utf8_identifiers.rs:7:9:7:13 | PathSegment |
+| utf8_identifiers.rs:7:9:7:13 | PathType |
+| utf8_identifiers.rs:10:1:10:3 | Visibility |
+| utf8_identifiers.rs:10:1:12:1 | main |
+| utf8_identifiers.rs:10:8:10:11 | Name |
+| utf8_identifiers.rs:10:12:10:13 | ParamList |
+| utf8_identifiers.rs:10:15:12:1 | BlockExpr |
+| utf8_identifiers.rs:10:15:12:1 | StmtList |
+| utf8_identifiers.rs:11:5:11:24 | LetStmt |
+| utf8_identifiers.rs:11:9:11:9 | Name |
+| utf8_identifiers.rs:11:9:11:9 | \u03b1 |
+| utf8_identifiers.rs:11:14:11:23 | 0.00001f64 |
diff --git a/rust/ql/test/extractor-tests/utf8/utf8-identifiers.rs b/rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs
similarity index 100%
rename from rust/ql/test/extractor-tests/utf8/utf8-identifiers.rs
rename to rust/ql/test/extractor-tests/utf8/utf8_identifiers.rs