Skip to content

Commit 63ccbec

Browse files
redsun82redsun82
committed
Rust: accept language test changes
1 parent 223f0c8 commit 63ccbec

File tree

10 files changed

+25
-74
lines changed

10 files changed

+25
-74
lines changed

‎rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ canonicalPath
22
| anonymous.rs:3:1:32:1 | fn canonicals | test::anonymous::canonicals |
33
| anonymous.rs:34:1:36:1 | fn other | test::anonymous::other |
44
| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
5-
| lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
6-
| lib.rs:2:1:2:12 | mod regular | test::regular |
5+
| lib.rs:1:1:1:18 | mod anonymous | test::anonymous |
6+
| lib.rs:2:1:2:16 | mod regular | test::regular |
77
| regular.rs:1:1:2:18 | struct Struct | test::regular::Struct |
88
| regular.rs:2:12:2:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
99
| regular.rs:2:12:2:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
@@ -42,8 +42,8 @@ canonicalPaths
4242
| anonymous.rs:26:5:31:5 | fn usage | None | None |
4343
| anonymous.rs:34:1:36:1 | fn other | repo::test | crate::anonymous::other |
4444
| anonymous.rs:35:5:35:23 | struct OtherStruct | None | None |
45-
| lib.rs:1:1:1:14 | mod anonymous | repo::test | crate::anonymous |
46-
| lib.rs:2:1:2:12 | mod regular | repo::test | crate::regular |
45+
| lib.rs:1:1:1:18 | mod anonymous | repo::test | crate::anonymous |
46+
| lib.rs:2:1:2:16 | mod regular | repo::test | crate::regular |
4747
| regular.rs:1:1:2:18 | struct Struct | repo::test | crate::regular::Struct |
4848
| regular.rs:2:12:2:17 | fn eq | repo::test | <crate::regular::Struct as crate::cmp::PartialEq>::eq |
4949
| regular.rs:2:12:2:17 | impl ...::Eq for Struct::<...> { ... } | None | None |

‎rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ canonicalPath
22
| anonymous.rs:6:1:35:1 | fn canonicals | test::anonymous::canonicals |
33
| anonymous.rs:37:1:39:1 | fn other | test::anonymous::other |
44
| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
5-
| lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
6-
| lib.rs:2:1:2:12 | mod regular | test::regular |
5+
| lib.rs:1:1:1:18 | mod anonymous | test::anonymous |
6+
| lib.rs:2:1:2:16 | mod regular | test::regular |
77
| regular.rs:4:1:5:18 | struct Struct | test::regular::Struct |
88
| regular.rs:5:12:5:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
99
| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
@@ -42,8 +42,8 @@ canonicalPaths
4242
| anonymous.rs:29:5:34:5 | fn usage | None | None |
4343
| anonymous.rs:37:1:39:1 | fn other | None | None |
4444
| anonymous.rs:38:5:38:23 | struct OtherStruct | None | None |
45-
| lib.rs:1:1:1:14 | mod anonymous | None | None |
46-
| lib.rs:2:1:2:12 | mod regular | None | None |
45+
| lib.rs:1:1:1:18 | mod anonymous | None | None |
46+
| lib.rs:2:1:2:16 | mod regular | None | None |
4747
| regular.rs:4:1:5:18 | struct Struct | None | None |
4848
| regular.rs:5:12:5:17 | fn eq | None | None |
4949
| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | None | None |

‎rust/ql/test/extractor-tests/generated/Module/Module.expected

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
instances
22
| gen_module.rs:3:1:4:8 | mod foo |
33
| gen_module.rs:5:1:7:1 | mod bar |
4-
| lib.rs:1:1:1:15 | mod gen_module |
4+
| lib.rs:1:1:1:19 | mod gen_module |
55
getExtendedCanonicalPath
66
| gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo |
77
| gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar |
8-
| lib.rs:1:1:1:15 | mod gen_module | crate::gen_module |
8+
| lib.rs:1:1:1:19 | mod gen_module | crate::gen_module |
99
getCrateOrigin
1010
| gen_module.rs:3:1:4:8 | mod foo | repo::test |
1111
| gen_module.rs:5:1:7:1 | mod bar | repo::test |
12-
| lib.rs:1:1:1:15 | mod gen_module | repo::test |
12+
| lib.rs:1:1:1:19 | mod gen_module | repo::test |
1313
getAttributeMacroExpansion
1414
getAttr
1515
getItemList
1616
| gen_module.rs:5:1:7:1 | mod bar | gen_module.rs:5:9:7:1 | ItemList |
1717
getName
1818
| gen_module.rs:3:1:4:8 | mod foo | gen_module.rs:4:5:4:7 | foo |
1919
| gen_module.rs:5:1:7:1 | mod bar | gen_module.rs:5:5:5:7 | bar |
20-
| lib.rs:1:1:1:15 | mod gen_module | lib.rs:1:5:1:14 | gen_module |
20+
| lib.rs:1:1:1:19 | mod gen_module | lib.rs:1:9:1:18 | gen_module |
2121
getVisibility
22+
| lib.rs:1:1:1:19 | mod gen_module | lib.rs:1:1:1:3 | Visibility |

‎rust/ql/test/extractor-tests/generated/Name/Name.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
instances
22
| gen_name.rs:3:4:3:12 | test_name |
33
| gen_name.rs:7:9:7:11 | foo |
4-
| lib.rs:1:5:1:12 | gen_name |
4+
| lib.rs:1:9:1:16 | gen_name |
55
getText
66
| gen_name.rs:3:4:3:12 | test_name | test_name |
77
| gen_name.rs:7:9:7:11 | foo | foo |
8-
| lib.rs:1:5:1:12 | gen_name | gen_name |
8+
| lib.rs:1:9:1:16 | gen_name | gen_name |

‎rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
instances
22
| gen_source_file.rs:1:1:9:2 | SourceFile |
3-
| lib.rs:1:1:1:20 | SourceFile |
3+
| lib.rs:1:1:1:24 | SourceFile |
44
getAttr
55
getItem
66
| gen_source_file.rs:1:1:9:2 | SourceFile | 0 | gen_source_file.rs:3:1:9:1 | fn test_source_file |
7-
| lib.rs:1:1:1:20 | SourceFile | 0 | lib.rs:1:1:1:20 | mod gen_source_file |
7+
| lib.rs:1:1:1:24 | SourceFile | 0 | lib.rs:1:1:1:24 | mod gen_source_file |

‎rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
instances
22
| gen_visibility.rs:7:7:7:9 | Visibility |
3+
| lib.rs:1:1:1:3 | Visibility |
34
getPath

‎rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ lib.rs:
146146
# 1| [SourceFile] SourceFile
147147
# 1| getItem(0): [Module] mod call
148148
# 1| getName(): [Name] call
149+
# 1| getVisibility(): [Visibility] Visibility
149150
# 2| getItem(1): [Module] mod macro_expansion
150151
# 2| getName(): [Name] macro_expansion
152+
# 2| getVisibility(): [Visibility] Visibility
151153
macro_expansion.rs:
152154
# 1| [SourceFile] SourceFile
153155
# 1| getItem(0): [Use] use proc_macro::{...}

‎rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -60,57 +60,3 @@ proc_macro.rs:
6060
# 5| getSegment(): [PathSegment] TokenStream
6161
# 5| getIdentifier(): [NameRef] TokenStream
6262
# 5| getVisibility(): [Visibility] Visibility
63-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/allocator-api2-0.2.21/src/lib.rs:
64-
# 1| [SourceFile] SourceFile
65-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/cfg-if-1.0.0/src/lib.rs:
66-
# 1| [SourceFile] SourceFile
67-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.146/src/lib.rs:
68-
# 1| [SourceFile] SourceFile
69-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/getopts-0.2.21/src/lib.rs:
70-
# 1| [SourceFile] SourceFile
71-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/hashbrown-0.15.2/src/lib.rs:
72-
# 1| [SourceFile] SourceFile
73-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.169/src/lib.rs:
74-
# 1| [SourceFile] SourceFile
75-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.95/src/lib.rs:
76-
# 1| [SourceFile] SourceFile
77-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/quote-1.0.40/src/lib.rs:
78-
# 1| [SourceFile] SourceFile
79-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rand-0.9.0/src/lib.rs:
80-
# 1| [SourceFile] SourceFile
81-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rand_core-0.9.0/src/lib.rs:
82-
# 1| [SourceFile] SourceFile
83-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rand_xorshift-0.4.0/src/lib.rs:
84-
# 1| [SourceFile] SourceFile
85-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/rustc-demangle-0.1.24/src/lib.rs:
86-
# 1| [SourceFile] SourceFile
87-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/syn-2.0.104/src/lib.rs:
88-
# 1| [SourceFile] SourceFile
89-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.18/src/lib.rs:
90-
# 1| [SourceFile] SourceFile
91-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-width-0.1.14/src/lib.rs:
92-
# 1| [SourceFile] SourceFile
93-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/zerocopy-0.8.17/src/lib.rs:
94-
# 1| [SourceFile] SourceFile
95-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/alloc/src/lib.rs:
96-
# 1| [SourceFile] SourceFile
97-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/lib.rs:
98-
# 1| [SourceFile] SourceFile
99-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/panic_abort/src/lib.rs:
100-
# 1| [SourceFile] SourceFile
101-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/panic_unwind/src/lib.rs:
102-
# 1| [SourceFile] SourceFile
103-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/proc_macro/src/lib.rs:
104-
# 1| [SourceFile] SourceFile
105-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/lib.rs:
106-
# 1| [SourceFile] SourceFile
107-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/lib.rs:
108-
# 1| [SourceFile] SourceFile
109-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/test/src/lib.rs:
110-
# 1| [SourceFile] SourceFile
111-
resolved/macro-in-library.testproj/trap/rust/crates/home/redsun82/.rustup/toolchains/1.86-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/unwind/src/lib.rs:
112-
# 1| [SourceFile] SourceFile
113-
resolved/macro-in-library.testproj/trap/rust/crateslib.rs:
114-
# 1| [SourceFile] SourceFile
115-
resolved/macro-in-library.testproj/trap/rust/cratesproc_macro.rs:
116-
# 1| [SourceFile] SourceFile

‎rust/ql/test/extractor-tests/utf8/ast.expected

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
| lib.rs:1:1:1:21 | SourceFile |
2-
| lib.rs:1:1:1:21 | mod utf8_identifiers |
3-
| lib.rs:1:5:1:20 | utf8_identifiers |
1+
| lib.rs:1:1:1:3 | Visibility |
2+
| lib.rs:1:1:1:25 | SourceFile |
3+
| lib.rs:1:1:1:25 | mod utf8_identifiers |
4+
| lib.rs:1:9:1:24 | utf8_identifiers |
45
| utf8_identifiers.rs:1:1:4:6 | fn foo |
56
| utf8_identifiers.rs:1:1:12:2 | SourceFile |
67
| utf8_identifiers.rs:1:4:1:6 | foo |

‎rust/ql/test/library-tests/path-resolution/path-resolution.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod
2-
| lib.rs:1:1:1:7 | mod my |
2+
| lib.rs:1:1:1:11 | mod my |
33
| main.rs:1:1:1:7 | mod my |
44
| main.rs:7:1:7:8 | mod my2 |
55
| main.rs:13:1:37:1 | mod m1 |

0 commit comments

Comments
 (0)