Skip to content

Commit 0e2c82b

Browse files
data-douserdata-douser
committed
Refresh rust PrintAST/PrintCFG expected with rust toolchain installed
CI runs query unit tests with install-language-runtimes: true, which makes rustc/cargo available to the rust extractor and causes println! and similar macros to be expanded to their stdlib internals was performed without rust installed locally, so the expected files captured the collapsed output and did not match CI. Re-learned with rustc 1.95.0 installed via rustup, matching the CI runner environment.
1 parent bc35dfd commit 0e2c82b

2 files changed

Lines changed: 264 additions & 4 deletions

File tree

‎server/ql/rust/tools/test/PrintAST/PrintAST.expected‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,32 @@ Example1.rs:
108108
# 28| getSegment(): [PathSegment] println
109109
# 28| getIdentifier(): [NameRef] println
110110
# 28| getTokenTree(): [TokenTree] TokenTree
111+
# 28| getMacroCallExpansion(): [BlockExpr] { ... }
112+
# 28| getStmtList(): [StmtList] StmtList
113+
# 28| getTailExpr(): [BlockExpr] { ... }
114+
# 28| getStmtList(): [StmtList] StmtList
115+
# 28| getStatement(0): [ExprStmt] ExprStmt
116+
# 28| getExpr(): [CallExpr] ...::_print(...)
117+
# 28| getArgList(): [ArgList] ArgList
118+
# 28| getArg(0): [MacroExpr] MacroExpr
119+
# 28| getMacroCall(): [MacroCall] ...::format_args_nl!...
120+
# 28| getPath(): [Path] ...::format_args_nl
121+
# 28| getQualifier(): [Path] $crate
122+
# 28| getSegment(): [PathSegment] $crate
123+
# 28| getIdentifier(): [NameRef] $crate
124+
# 28| getSegment(): [PathSegment] format_args_nl
125+
# 28| getIdentifier(): [NameRef] format_args_nl
126+
# 28| getTokenTree(): [TokenTree] TokenTree
127+
# 28| getFunction(): [PathExpr] ...::_print
128+
# 28| getPath(): [Path] ...::_print
129+
# 28| getQualifier(): [Path] ...::io
130+
# 28| getQualifier(): [Path] $crate
131+
# 28| getSegment(): [PathSegment] $crate
132+
# 28| getIdentifier(): [NameRef] $crate
133+
# 28| getSegment(): [PathSegment] io
134+
# 28| getIdentifier(): [NameRef] io
135+
# 28| getSegment(): [PathSegment] _print
136+
# 28| getIdentifier(): [NameRef] _print
111137
# 27| getIterable(): [RefExpr] &numbers
112138
# 27| getExpr(): [VariableAccess] numbers
113139
# 27| getPath(): [Path] numbers
@@ -132,6 +158,32 @@ Example1.rs:
132158
# 35| getSegment(): [PathSegment] println
133159
# 35| getIdentifier(): [NameRef] println
134160
# 35| getTokenTree(): [TokenTree] TokenTree
161+
# 35| getMacroCallExpansion(): [BlockExpr] { ... }
162+
# 35| getStmtList(): [StmtList] StmtList
163+
# 35| getTailExpr(): [BlockExpr] { ... }
164+
# 35| getStmtList(): [StmtList] StmtList
165+
# 35| getStatement(0): [ExprStmt] ExprStmt
166+
# 35| getExpr(): [CallExpr] ...::_print(...)
167+
# 35| getArgList(): [ArgList] ArgList
168+
# 35| getArg(0): [MacroExpr] MacroExpr
169+
# 35| getMacroCall(): [MacroCall] ...::format_args_nl!...
170+
# 35| getPath(): [Path] ...::format_args_nl
171+
# 35| getQualifier(): [Path] $crate
172+
# 35| getSegment(): [PathSegment] $crate
173+
# 35| getIdentifier(): [NameRef] $crate
174+
# 35| getSegment(): [PathSegment] format_args_nl
175+
# 35| getIdentifier(): [NameRef] format_args_nl
176+
# 35| getTokenTree(): [TokenTree] TokenTree
177+
# 35| getFunction(): [PathExpr] ...::_print
178+
# 35| getPath(): [Path] ...::_print
179+
# 35| getQualifier(): [Path] ...::io
180+
# 35| getQualifier(): [Path] $crate
181+
# 35| getSegment(): [PathSegment] $crate
182+
# 35| getIdentifier(): [NameRef] $crate
183+
# 35| getSegment(): [PathSegment] io
184+
# 35| getIdentifier(): [NameRef] io
185+
# 35| getSegment(): [PathSegment] _print
186+
# 35| getIdentifier(): [NameRef] _print
135187
# 32| getThen(): [BlockExpr] { ... }
136188
# 32| getStmtList(): [StmtList] StmtList
137189
# 33| getStatement(0): [ExprStmt] ExprStmt
@@ -141,6 +193,32 @@ Example1.rs:
141193
# 33| getSegment(): [PathSegment] println
142194
# 33| getIdentifier(): [NameRef] println
143195
# 33| getTokenTree(): [TokenTree] TokenTree
196+
# 33| getMacroCallExpansion(): [BlockExpr] { ... }
197+
# 33| getStmtList(): [StmtList] StmtList
198+
# 33| getTailExpr(): [BlockExpr] { ... }
199+
# 33| getStmtList(): [StmtList] StmtList
200+
# 33| getStatement(0): [ExprStmt] ExprStmt
201+
# 33| getExpr(): [CallExpr] ...::_print(...)
202+
# 33| getArgList(): [ArgList] ArgList
203+
# 33| getArg(0): [MacroExpr] MacroExpr
204+
# 33| getMacroCall(): [MacroCall] ...::format_args_nl!...
205+
# 33| getPath(): [Path] ...::format_args_nl
206+
# 33| getQualifier(): [Path] $crate
207+
# 33| getSegment(): [PathSegment] $crate
208+
# 33| getIdentifier(): [NameRef] $crate
209+
# 33| getSegment(): [PathSegment] format_args_nl
210+
# 33| getIdentifier(): [NameRef] format_args_nl
211+
# 33| getTokenTree(): [TokenTree] TokenTree
212+
# 33| getFunction(): [PathExpr] ...::_print
213+
# 33| getPath(): [Path] ...::_print
214+
# 33| getQualifier(): [Path] ...::io
215+
# 33| getQualifier(): [Path] $crate
216+
# 33| getSegment(): [PathSegment] $crate
217+
# 33| getIdentifier(): [NameRef] $crate
218+
# 33| getSegment(): [PathSegment] io
219+
# 33| getIdentifier(): [NameRef] io
220+
# 33| getSegment(): [PathSegment] _print
221+
# 33| getIdentifier(): [NameRef] _print
144222
# 39| getTailExpr(): [MatchExpr] match x { ... }
145223
# 39| getScrutinee(): [VariableAccess] x
146224
# 39| getPath(): [Path] x
@@ -154,6 +232,30 @@ Example1.rs:
154232
# 40| getSegment(): [PathSegment] println
155233
# 40| getIdentifier(): [NameRef] println
156234
# 40| getTokenTree(): [TokenTree] TokenTree
235+
# 40| getMacroCallExpansion(): [BlockExpr] { ... }
236+
# 40| getStmtList(): [StmtList] StmtList
237+
# 40| getStatement(0): [ExprStmt] ExprStmt
238+
# 40| getExpr(): [CallExpr] ...::_print(...)
239+
# 40| getArgList(): [ArgList] ArgList
240+
# 40| getArg(0): [MacroExpr] MacroExpr
241+
# 40| getMacroCall(): [MacroCall] ...::format_args_nl!...
242+
# 40| getPath(): [Path] ...::format_args_nl
243+
# 40| getQualifier(): [Path] $crate
244+
# 40| getSegment(): [PathSegment] $crate
245+
# 40| getIdentifier(): [NameRef] $crate
246+
# 40| getSegment(): [PathSegment] format_args_nl
247+
# 40| getIdentifier(): [NameRef] format_args_nl
248+
# 40| getTokenTree(): [TokenTree] TokenTree
249+
# 40| getFunction(): [PathExpr] ...::_print
250+
# 40| getPath(): [Path] ...::_print
251+
# 40| getQualifier(): [Path] ...::io
252+
# 40| getQualifier(): [Path] $crate
253+
# 40| getSegment(): [PathSegment] $crate
254+
# 40| getIdentifier(): [NameRef] $crate
255+
# 40| getSegment(): [PathSegment] io
256+
# 40| getIdentifier(): [NameRef] io
257+
# 40| getSegment(): [PathSegment] _print
258+
# 40| getIdentifier(): [NameRef] _print
157259
# 40| getPat(): [LiteralPat] 0
158260
# 40| getLiteral(): [IntegerLiteralExpr] 0
159261
# 41| getArm(1): [MatchArm] 1 => ...
@@ -163,6 +265,30 @@ Example1.rs:
163265
# 41| getSegment(): [PathSegment] println
164266
# 41| getIdentifier(): [NameRef] println
165267
# 41| getTokenTree(): [TokenTree] TokenTree
268+
# 41| getMacroCallExpansion(): [BlockExpr] { ... }
269+
# 41| getStmtList(): [StmtList] StmtList
270+
# 41| getStatement(0): [ExprStmt] ExprStmt
271+
# 41| getExpr(): [CallExpr] ...::_print(...)
272+
# 41| getArgList(): [ArgList] ArgList
273+
# 41| getArg(0): [MacroExpr] MacroExpr
274+
# 41| getMacroCall(): [MacroCall] ...::format_args_nl!...
275+
# 41| getPath(): [Path] ...::format_args_nl
276+
# 41| getQualifier(): [Path] $crate
277+
# 41| getSegment(): [PathSegment] $crate
278+
# 41| getIdentifier(): [NameRef] $crate
279+
# 41| getSegment(): [PathSegment] format_args_nl
280+
# 41| getIdentifier(): [NameRef] format_args_nl
281+
# 41| getTokenTree(): [TokenTree] TokenTree
282+
# 41| getFunction(): [PathExpr] ...::_print
283+
# 41| getPath(): [Path] ...::_print
284+
# 41| getQualifier(): [Path] ...::io
285+
# 41| getQualifier(): [Path] $crate
286+
# 41| getSegment(): [PathSegment] $crate
287+
# 41| getIdentifier(): [NameRef] $crate
288+
# 41| getSegment(): [PathSegment] io
289+
# 41| getIdentifier(): [NameRef] io
290+
# 41| getSegment(): [PathSegment] _print
291+
# 41| getIdentifier(): [NameRef] _print
166292
# 41| getPat(): [LiteralPat] 1
167293
# 41| getLiteral(): [IntegerLiteralExpr] 1
168294
# 42| getArm(2): [MatchArm] _ => ...
@@ -172,6 +298,30 @@ Example1.rs:
172298
# 42| getSegment(): [PathSegment] println
173299
# 42| getIdentifier(): [NameRef] println
174300
# 42| getTokenTree(): [TokenTree] TokenTree
301+
# 42| getMacroCallExpansion(): [BlockExpr] { ... }
302+
# 42| getStmtList(): [StmtList] StmtList
303+
# 42| getStatement(0): [ExprStmt] ExprStmt
304+
# 42| getExpr(): [CallExpr] ...::_print(...)
305+
# 42| getArgList(): [ArgList] ArgList
306+
# 42| getArg(0): [MacroExpr] MacroExpr
307+
# 42| getMacroCall(): [MacroCall] ...::format_args_nl!...
308+
# 42| getPath(): [Path] ...::format_args_nl
309+
# 42| getQualifier(): [Path] $crate
310+
# 42| getSegment(): [PathSegment] $crate
311+
# 42| getIdentifier(): [NameRef] $crate
312+
# 42| getSegment(): [PathSegment] format_args_nl
313+
# 42| getIdentifier(): [NameRef] format_args_nl
314+
# 42| getTokenTree(): [TokenTree] TokenTree
315+
# 42| getFunction(): [PathExpr] ...::_print
316+
# 42| getPath(): [Path] ...::_print
317+
# 42| getQualifier(): [Path] ...::io
318+
# 42| getQualifier(): [Path] $crate
319+
# 42| getSegment(): [PathSegment] $crate
320+
# 42| getIdentifier(): [NameRef] $crate
321+
# 42| getSegment(): [PathSegment] io
322+
# 42| getIdentifier(): [NameRef] io
323+
# 42| getSegment(): [PathSegment] _print
324+
# 42| getIdentifier(): [NameRef] _print
175325
# 42| getPat(): [WildcardPat] _
176326
# 23| getName(): [Name] demo
177327
# 46| getItem(4): [Function] fn main
@@ -198,6 +348,32 @@ Example1.rs:
198348
# 48| getSegment(): [PathSegment] println
199349
# 48| getIdentifier(): [NameRef] println
200350
# 48| getTokenTree(): [TokenTree] TokenTree
351+
# 48| getMacroCallExpansion(): [BlockExpr] { ... }
352+
# 48| getStmtList(): [StmtList] StmtList
353+
# 48| getTailExpr(): [BlockExpr] { ... }
354+
# 48| getStmtList(): [StmtList] StmtList
355+
# 48| getStatement(0): [ExprStmt] ExprStmt
356+
# 48| getExpr(): [CallExpr] ...::_print(...)
357+
# 48| getArgList(): [ArgList] ArgList
358+
# 48| getArg(0): [MacroExpr] MacroExpr
359+
# 48| getMacroCall(): [MacroCall] ...::format_args_nl!...
360+
# 48| getPath(): [Path] ...::format_args_nl
361+
# 48| getQualifier(): [Path] $crate
362+
# 48| getSegment(): [PathSegment] $crate
363+
# 48| getIdentifier(): [NameRef] $crate
364+
# 48| getSegment(): [PathSegment] format_args_nl
365+
# 48| getIdentifier(): [NameRef] format_args_nl
366+
# 48| getTokenTree(): [TokenTree] TokenTree
367+
# 48| getFunction(): [PathExpr] ...::_print
368+
# 48| getPath(): [Path] ...::_print
369+
# 48| getQualifier(): [Path] ...::io
370+
# 48| getQualifier(): [Path] $crate
371+
# 48| getSegment(): [PathSegment] $crate
372+
# 48| getIdentifier(): [NameRef] $crate
373+
# 48| getSegment(): [PathSegment] io
374+
# 48| getIdentifier(): [NameRef] io
375+
# 48| getSegment(): [PathSegment] _print
376+
# 48| getIdentifier(): [NameRef] _print
201377
# 49| getStatement(2): [LetStmt] let ... = ...
202378
# 49| getInitializer(): [CallExpr] helper(...)
203379
# 49| getArgList(): [ArgList] ArgList

0 commit comments

Comments
 (0)