Skip to content

Commit 51cdbd6

Browse files
committed
Rust: update expected output
1 parent e75a4d5 commit 51cdbd6

File tree

13 files changed

+52
-29
lines changed

13 files changed

+52
-29
lines changed

rust/ql/test/extractor-tests/crate_graph/crates.expected

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#-----| Crate(alloc@0.0.0)
22
#-----| core -> Crate(core@0.0.0)
3-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
4-
#-----| rand -> Crate(rand@0.8.5)
5-
#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
3+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
4+
#-----| rand -> Crate(rand@0.9.0)
5+
#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
66

77
#-----| Crate(allocator_api2@0.2.21)
88

@@ -16,7 +16,7 @@
1616

1717
#-----| Crate(cfg_if@1.0.0)
1818
#-----| core -> Crate(core@0.0.0)
19-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
19+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
2020

2121
#-----| Crate(cfg_if@1.0.1)
2222
#-----| proc_macro -> Crate(proc_macro@0.0.0)
@@ -25,12 +25,10 @@
2525
#-----| std -> Crate(std@0.0.0)
2626
#-----| test -> Crate(test@0.0.0)
2727

28-
#-----| Crate(compiler_builtins@0.1.140)
28+
#-----| Crate(compiler_builtins@0.1.146)
2929
#-----| core -> Crate(core@0.0.0)
3030

3131
#-----| Crate(core@0.0.0)
32-
#-----| rand -> Crate(rand@0.8.5)
33-
#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
3432

3533
#-----| Crate(crypto_common@0.1.6)
3634
#-----| proc_macro -> Crate(proc_macro@0.0.0)
@@ -67,7 +65,7 @@
6765
#-----| allocator_api2 -> Crate(allocator_api2@0.2.21)
6866
#-----| alloc -> Crate(alloc@0.0.0)
6967
#-----| core -> Crate(core@0.0.0)
70-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
68+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
7169

7270
#-----| Crate(libc@0.2.169)
7371
#-----| rustc_std_workspace_core -> Crate(core@0.0.0)
@@ -102,14 +100,14 @@ main.rs:
102100
#-----| Crate(panic_abort@0.0.0)
103101
#-----| alloc -> Crate(alloc@0.0.0)
104102
#-----| core -> Crate(core@0.0.0)
105-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
103+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
106104
#-----| cfg_if -> Crate(cfg_if@1.0.0)
107105
#-----| libc -> Crate(libc@0.2.169)
108106

109107
#-----| Crate(panic_unwind@0.0.0)
110108
#-----| alloc -> Crate(alloc@0.0.0)
111109
#-----| core -> Crate(core@0.0.0)
112-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
110+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
113111
#-----| cfg_if -> Crate(cfg_if@1.0.0)
114112
#-----| libc -> Crate(libc@0.2.169)
115113
#-----| unwind -> Crate(unwind@0.0.0)
@@ -118,27 +116,29 @@ main.rs:
118116
#-----| core -> Crate(core@0.0.0)
119117
#-----| std -> Crate(std@0.0.0)
120118

121-
#-----| Crate(rand@0.8.5)
122-
#-----| rand_core -> Crate(rand_core@0.6.4)
119+
#-----| Crate(rand@0.9.0)
120+
#-----| zerocopy -> Crate(zerocopy@0.8.17)
121+
#-----| rand_core -> Crate(rand_core@0.9.0)
123122

124-
#-----| Crate(rand_core@0.6.4)
123+
#-----| Crate(rand_core@0.9.0)
124+
#-----| zerocopy -> Crate(zerocopy@0.8.17)
125125

126-
#-----| Crate(rand_xorshift@0.3.0)
127-
#-----| rand_core -> Crate(rand_core@0.6.4)
126+
#-----| Crate(rand_xorshift@0.4.0)
127+
#-----| rand_core -> Crate(rand_core@0.9.0)
128128

129129
#-----| Crate(rustc_demangle@0.1.24)
130130
#-----| core -> Crate(core@0.0.0)
131-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
131+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
132132

133133
#-----| Crate(std@0.0.0)
134134
#-----| alloc -> Crate(alloc@0.0.0)
135135
#-----| core -> Crate(core@0.0.0)
136-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
136+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
137137
#-----| cfg_if -> Crate(cfg_if@1.0.0)
138138
#-----| hashbrown -> Crate(hashbrown@0.15.2)
139139
#-----| libc -> Crate(libc@0.2.169)
140-
#-----| rand -> Crate(rand@0.8.5)
141-
#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
140+
#-----| rand -> Crate(rand@0.9.0)
141+
#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
142142
#-----| rustc_demangle -> Crate(rustc_demangle@0.1.24)
143143
#-----| panic_abort -> Crate(panic_abort@0.0.0)
144144
#-----| unwind -> Crate(unwind@0.0.0)
@@ -148,7 +148,7 @@ main.rs:
148148
#-----| Crate(std_detect@0.1.5)
149149
#-----| alloc -> Crate(alloc@0.0.0)
150150
#-----| core -> Crate(core@0.0.0)
151-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
151+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
152152
#-----| cfg_if -> Crate(cfg_if@1.0.0)
153153
#-----| libc -> Crate(libc@0.2.169)
154154

@@ -178,11 +178,11 @@ lib.rs:
178178
#-----| Crate(unicode_width@0.1.14)
179179
#-----| core -> Crate(core@0.0.0)
180180
#-----| std -> Crate(std@0.0.0)
181-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
181+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
182182

183183
#-----| Crate(unwind@0.0.0)
184184
#-----| core -> Crate(core@0.0.0)
185-
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
185+
#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
186186
#-----| cfg_if -> Crate(cfg_if@1.0.0)
187187
#-----| libc -> Crate(libc@0.2.169)
188188

@@ -192,3 +192,5 @@ lib.rs:
192192
#-----| core -> Crate(core@0.0.0)
193193
#-----| std -> Crate(std@0.0.0)
194194
#-----| test -> Crate(test@0.0.0)
195+
196+
#-----| Crate(zerocopy@0.8.17)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| gen_asm_label.rs:10:9:10:47 | AsmLabel | hasBlockExpr: | yes |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| gen_asm_label.rs:10:9:10:47 | AsmLabel | gen_asm_label.rs:10:15:10:47 | { ... } |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | hasGenericParamList: | yes |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | gen_closure_binder.rs:7:24:7:43 | <...> |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasImplementation: | yes |
1+
| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | yes |

rust/ql/test/extractor-tests/generated/Const/Const_getGenericParamList.expected

Whitespace-only changes.

rust/ql/test/extractor-tests/generated/Const/Const_getWhereClause.expected

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
extractionWarning
2+
| included/included.rs:2:9:2:39 | macro expansion failed: could not resolve macro 'concat' |
3+
| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |
4+
| macro_expansion.rs:63:9:63:32 | macro expansion failed: could not resolve macro 'include_str' |

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ included/included.rs:
140140
# 2| getSegment(): [PathSegment] concat
141141
# 2| getIdentifier(): [NameRef] concat
142142
# 2| getTokenTree(): [TokenTree] TokenTree
143-
# 2| getMacroCallExpansion(): [StringLiteralExpr] "Hello world!"
144143
# 1| getName(): [Name] included
145144
# 2| [Comment] //...
146145
lib.rs:
@@ -655,7 +654,6 @@ macro_expansion.rs:
655654
# 56| getSegment(): [PathSegment] concat
656655
# 56| getIdentifier(): [NameRef] concat
657656
# 56| getTokenTree(): [TokenTree] TokenTree
658-
# 56| getMacroCallExpansion(): [StringLiteralExpr] "<{}>"
659657
# 55| getFunction(): [PathExpr] ...::format
660658
# 55| getPath(): [Path] ...::format
661659
# 55| getQualifier(): [Path] ...::fmt
@@ -714,7 +712,6 @@ macro_expansion.rs:
714712
# 63| getSegment(): [PathSegment] include_str
715713
# 63| getIdentifier(): [NameRef] include_str
716714
# 63| getTokenTree(): [TokenTree] TokenTree
717-
# 63| getMacroCallExpansion(): [StringLiteralExpr] ""
718715
# 63| getPath(): [Path] doc
719716
# 63| getSegment(): [PathSegment] doc
720717
# 63| getIdentifier(): [NameRef] doc

0 commit comments

Comments
 (0)