Skip to content

Commit 889ef33

Browse files
hvitvedhvitved
committed
Rust: Update expected test output
1 parent 9d8e997 commit 889ef33

File tree

3 files changed

+96
-96
lines changed

3 files changed

+96
-96
lines changed

‎rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

+20-20
Original file line numberDiff line numberDiff line change
@@ -471,13 +471,13 @@ localStep
471471
| main.rs:304:11:304:12 | s1 | main.rs:305:9:305:45 | ... \| ... | |
472472
| main.rs:305:9:305:45 | ... \| ... | main.rs:305:9:305:25 | ...::A(...) | |
473473
| main.rs:305:9:305:45 | ... \| ... | main.rs:305:29:305:45 | ...::B(...) | |
474-
| main.rs:305:9:305:45 | [SSA] [match(true)] phi | main.rs:305:55:305:55 | n | |
475-
| main.rs:305:24:305:24 | [SSA] [input] [match(true)] phi | main.rs:305:9:305:45 | [SSA] [match(true)] phi | |
476-
| main.rs:305:24:305:24 | [SSA] n | main.rs:305:24:305:24 | [SSA] [input] [match(true)] phi | |
474+
| main.rs:305:9:305:45 | [SSA] phi | main.rs:305:55:305:55 | n | |
475+
| main.rs:305:24:305:24 | [SSA] [input] phi | main.rs:305:9:305:45 | [SSA] phi | |
476+
| main.rs:305:24:305:24 | [SSA] n | main.rs:305:24:305:24 | [SSA] [input] phi | |
477477
| main.rs:305:24:305:24 | n | main.rs:305:24:305:24 | [SSA] n | |
478478
| main.rs:305:24:305:24 | n | main.rs:305:24:305:24 | n | |
479-
| main.rs:305:44:305:44 | [SSA] [input] [match(true)] phi | main.rs:305:9:305:45 | [SSA] [match(true)] phi | |
480-
| main.rs:305:44:305:44 | [SSA] n | main.rs:305:44:305:44 | [SSA] [input] [match(true)] phi | |
479+
| main.rs:305:44:305:44 | [SSA] [input] phi | main.rs:305:9:305:45 | [SSA] phi | |
480+
| main.rs:305:44:305:44 | [SSA] n | main.rs:305:44:305:44 | [SSA] [input] phi | |
481481
| main.rs:305:44:305:44 | n | main.rs:305:44:305:44 | [SSA] n | |
482482
| main.rs:305:44:305:44 | n | main.rs:305:44:305:44 | n | |
483483
| main.rs:305:50:305:56 | sink(...) | main.rs:304:5:306:5 | match s1 { ... } | |
@@ -514,13 +514,13 @@ localStep
514514
| main.rs:322:11:322:12 | s1 | main.rs:323:9:323:19 | ... \| ... | |
515515
| main.rs:323:9:323:19 | ... \| ... | main.rs:323:9:323:12 | A(...) | |
516516
| main.rs:323:9:323:19 | ... \| ... | main.rs:323:16:323:19 | B(...) | |
517-
| main.rs:323:9:323:19 | [SSA] [match(true)] phi | main.rs:323:29:323:29 | n | |
518-
| main.rs:323:11:323:11 | [SSA] [input] [match(true)] phi | main.rs:323:9:323:19 | [SSA] [match(true)] phi | |
519-
| main.rs:323:11:323:11 | [SSA] n | main.rs:323:11:323:11 | [SSA] [input] [match(true)] phi | |
517+
| main.rs:323:9:323:19 | [SSA] phi | main.rs:323:29:323:29 | n | |
518+
| main.rs:323:11:323:11 | [SSA] [input] phi | main.rs:323:9:323:19 | [SSA] phi | |
519+
| main.rs:323:11:323:11 | [SSA] n | main.rs:323:11:323:11 | [SSA] [input] phi | |
520520
| main.rs:323:11:323:11 | n | main.rs:323:11:323:11 | [SSA] n | |
521521
| main.rs:323:11:323:11 | n | main.rs:323:11:323:11 | n | |
522-
| main.rs:323:18:323:18 | [SSA] [input] [match(true)] phi | main.rs:323:9:323:19 | [SSA] [match(true)] phi | |
523-
| main.rs:323:18:323:18 | [SSA] n | main.rs:323:18:323:18 | [SSA] [input] [match(true)] phi | |
522+
| main.rs:323:18:323:18 | [SSA] [input] phi | main.rs:323:9:323:19 | [SSA] phi | |
523+
| main.rs:323:18:323:18 | [SSA] n | main.rs:323:18:323:18 | [SSA] [input] phi | |
524524
| main.rs:323:18:323:18 | n | main.rs:323:18:323:18 | [SSA] n | |
525525
| main.rs:323:18:323:18 | n | main.rs:323:18:323:18 | n | |
526526
| main.rs:323:24:323:30 | sink(...) | main.rs:322:5:324:5 | match s1 { ... } | |
@@ -557,13 +557,13 @@ localStep
557557
| main.rs:345:11:345:12 | s1 | main.rs:346:9:346:71 | ... \| ... | |
558558
| main.rs:346:9:346:71 | ... \| ... | main.rs:346:9:346:38 | ...::C {...} | |
559559
| main.rs:346:9:346:71 | ... \| ... | main.rs:346:42:346:71 | ...::D {...} | |
560-
| main.rs:346:9:346:71 | [SSA] [match(true)] phi | main.rs:346:81:346:81 | n | |
561-
| main.rs:346:36:346:36 | [SSA] [input] [match(true)] phi | main.rs:346:9:346:71 | [SSA] [match(true)] phi | |
562-
| main.rs:346:36:346:36 | [SSA] n | main.rs:346:36:346:36 | [SSA] [input] [match(true)] phi | |
560+
| main.rs:346:9:346:71 | [SSA] phi | main.rs:346:81:346:81 | n | |
561+
| main.rs:346:36:346:36 | [SSA] [input] phi | main.rs:346:9:346:71 | [SSA] phi | |
562+
| main.rs:346:36:346:36 | [SSA] n | main.rs:346:36:346:36 | [SSA] [input] phi | |
563563
| main.rs:346:36:346:36 | n | main.rs:346:36:346:36 | [SSA] n | |
564564
| main.rs:346:36:346:36 | n | main.rs:346:36:346:36 | n | |
565-
| main.rs:346:69:346:69 | [SSA] [input] [match(true)] phi | main.rs:346:9:346:71 | [SSA] [match(true)] phi | |
566-
| main.rs:346:69:346:69 | [SSA] n | main.rs:346:69:346:69 | [SSA] [input] [match(true)] phi | |
565+
| main.rs:346:69:346:69 | [SSA] [input] phi | main.rs:346:9:346:71 | [SSA] phi | |
566+
| main.rs:346:69:346:69 | [SSA] n | main.rs:346:69:346:69 | [SSA] [input] phi | |
567567
| main.rs:346:69:346:69 | n | main.rs:346:69:346:69 | [SSA] n | |
568568
| main.rs:346:69:346:69 | n | main.rs:346:69:346:69 | n | |
569569
| main.rs:346:76:346:82 | sink(...) | main.rs:345:5:347:5 | match s1 { ... } | |
@@ -600,13 +600,13 @@ localStep
600600
| main.rs:365:11:365:12 | s1 | main.rs:366:9:366:43 | ... \| ... | |
601601
| main.rs:366:9:366:43 | ... \| ... | main.rs:366:9:366:24 | C {...} | |
602602
| main.rs:366:9:366:43 | ... \| ... | main.rs:366:28:366:43 | D {...} | |
603-
| main.rs:366:9:366:43 | [SSA] [match(true)] phi | main.rs:366:53:366:53 | n | |
604-
| main.rs:366:22:366:22 | [SSA] [input] [match(true)] phi | main.rs:366:9:366:43 | [SSA] [match(true)] phi | |
605-
| main.rs:366:22:366:22 | [SSA] n | main.rs:366:22:366:22 | [SSA] [input] [match(true)] phi | |
603+
| main.rs:366:9:366:43 | [SSA] phi | main.rs:366:53:366:53 | n | |
604+
| main.rs:366:22:366:22 | [SSA] [input] phi | main.rs:366:9:366:43 | [SSA] phi | |
605+
| main.rs:366:22:366:22 | [SSA] n | main.rs:366:22:366:22 | [SSA] [input] phi | |
606606
| main.rs:366:22:366:22 | n | main.rs:366:22:366:22 | [SSA] n | |
607607
| main.rs:366:22:366:22 | n | main.rs:366:22:366:22 | n | |
608-
| main.rs:366:41:366:41 | [SSA] [input] [match(true)] phi | main.rs:366:9:366:43 | [SSA] [match(true)] phi | |
609-
| main.rs:366:41:366:41 | [SSA] n | main.rs:366:41:366:41 | [SSA] [input] [match(true)] phi | |
608+
| main.rs:366:41:366:41 | [SSA] [input] phi | main.rs:366:9:366:43 | [SSA] phi | |
609+
| main.rs:366:41:366:41 | [SSA] n | main.rs:366:41:366:41 | [SSA] [input] phi | |
610610
| main.rs:366:41:366:41 | n | main.rs:366:41:366:41 | [SSA] n | |
611611
| main.rs:366:41:366:41 | n | main.rs:366:41:366:41 | n | |
612612
| main.rs:366:48:366:54 | sink(...) | main.rs:365:5:367:5 | match s1 { ... } | |

‎rust/ql/test/library-tests/variables/Cfg.expected

+22-22
Original file line numberDiff line numberDiff line change
@@ -453,11 +453,11 @@ edges
453453
| main.rs:190:11:190:16 | either | main.rs:191:9:191:24 | ...::Left(...) | |
454454
| main.rs:191:9:191:24 | ...::Left(...) | main.rs:191:22:191:23 | a3 | match |
455455
| main.rs:191:9:191:24 | ...::Left(...) | main.rs:191:28:191:44 | ...::Right(...) | no-match |
456-
| main.rs:191:9:191:44 | [match(true)] ... \| ... | main.rs:192:16:192:24 | print_i64 | match |
457-
| main.rs:191:22:191:23 | a3 | main.rs:191:9:191:44 | [match(true)] ... \| ... | match |
456+
| main.rs:191:9:191:44 | ... \| ... | main.rs:192:16:192:24 | print_i64 | match |
457+
| main.rs:191:22:191:23 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
458458
| main.rs:191:22:191:23 | a3 | main.rs:191:22:191:23 | a3 | |
459459
| main.rs:191:28:191:44 | ...::Right(...) | main.rs:191:42:191:43 | a3 | match |
460-
| main.rs:191:42:191:43 | a3 | main.rs:191:9:191:44 | [match(true)] ... \| ... | match |
460+
| main.rs:191:42:191:43 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
461461
| main.rs:191:42:191:43 | a3 | main.rs:191:42:191:43 | a3 | |
462462
| main.rs:192:16:192:24 | print_i64 | main.rs:192:26:192:27 | a3 | |
463463
| main.rs:192:16:192:28 | print_i64(...) | main.rs:190:5:193:5 | match either { ... } | |
@@ -476,35 +476,35 @@ edges
476476
| main.rs:204:11:204:12 | tv | main.rs:205:9:205:30 | ...::First(...) | |
477477
| main.rs:205:9:205:30 | ...::First(...) | main.rs:205:28:205:29 | a4 | match |
478478
| main.rs:205:9:205:30 | ...::First(...) | main.rs:205:34:205:56 | ...::Second(...) | no-match |
479-
| main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | main.rs:206:16:206:24 | print_i64 | match |
480-
| main.rs:205:28:205:29 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
479+
| main.rs:205:9:205:81 | ... \| ... \| ... | main.rs:206:16:206:24 | print_i64 | match |
480+
| main.rs:205:28:205:29 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
481481
| main.rs:205:28:205:29 | a4 | main.rs:205:28:205:29 | a4 | |
482482
| main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:54:205:55 | a4 | match |
483483
| main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:60:205:81 | ...::Third(...) | no-match |
484-
| main.rs:205:54:205:55 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
484+
| main.rs:205:54:205:55 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
485485
| main.rs:205:54:205:55 | a4 | main.rs:205:54:205:55 | a4 | |
486486
| main.rs:205:60:205:81 | ...::Third(...) | main.rs:205:79:205:80 | a4 | match |
487-
| main.rs:205:79:205:80 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
487+
| main.rs:205:79:205:80 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
488488
| main.rs:205:79:205:80 | a4 | main.rs:205:79:205:80 | a4 | |
489489
| main.rs:206:16:206:24 | print_i64 | main.rs:206:26:206:27 | a4 | |
490490
| main.rs:206:16:206:28 | print_i64(...) | main.rs:204:5:207:5 | match tv { ... } | |
491491
| main.rs:206:26:206:27 | a4 | main.rs:206:16:206:28 | print_i64(...) | |
492492
| main.rs:208:5:211:5 | ExprStmt | main.rs:208:11:208:12 | tv | |
493493
| main.rs:208:5:211:5 | match tv { ... } | main.rs:212:11:212:12 | tv | |
494494
| main.rs:208:11:208:12 | tv | main.rs:209:10:209:31 | ...::First(...) | |
495-
| main.rs:209:9:209:83 | [match(true)] ... \| ... | main.rs:210:16:210:24 | print_i64 | match |
495+
| main.rs:209:9:209:83 | ... \| ... | main.rs:210:16:210:24 | print_i64 | match |
496496
| main.rs:209:10:209:31 | ...::First(...) | main.rs:209:29:209:30 | a5 | match |
497497
| main.rs:209:10:209:31 | ...::First(...) | main.rs:209:35:209:57 | ...::Second(...) | no-match |
498498
| main.rs:209:10:209:57 | [match(false)] ... \| ... | main.rs:209:62:209:83 | ...::Third(...) | no-match |
499-
| main.rs:209:10:209:57 | [match(true)] ... \| ... | main.rs:209:9:209:83 | [match(true)] ... \| ... | match |
499+
| main.rs:209:10:209:57 | [match(true)] ... \| ... | main.rs:209:9:209:83 | ... \| ... | match |
500500
| main.rs:209:29:209:30 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
501501
| main.rs:209:29:209:30 | a5 | main.rs:209:29:209:30 | a5 | |
502502
| main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:10:209:57 | [match(false)] ... \| ... | no-match |
503503
| main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:55:209:56 | a5 | match |
504504
| main.rs:209:55:209:56 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
505505
| main.rs:209:55:209:56 | a5 | main.rs:209:55:209:56 | a5 | |
506506
| main.rs:209:62:209:83 | ...::Third(...) | main.rs:209:81:209:82 | a5 | match |
507-
| main.rs:209:81:209:82 | a5 | main.rs:209:9:209:83 | [match(true)] ... \| ... | match |
507+
| main.rs:209:81:209:82 | a5 | main.rs:209:9:209:83 | ... \| ... | match |
508508
| main.rs:209:81:209:82 | a5 | main.rs:209:81:209:82 | a5 | |
509509
| main.rs:210:16:210:24 | print_i64 | main.rs:210:26:210:27 | a5 | |
510510
| main.rs:210:16:210:28 | print_i64(...) | main.rs:208:5:211:5 | match tv { ... } | |
@@ -513,16 +513,16 @@ edges
513513
| main.rs:212:11:212:12 | tv | main.rs:213:9:213:30 | ...::First(...) | |
514514
| main.rs:213:9:213:30 | ...::First(...) | main.rs:213:28:213:29 | a6 | match |
515515
| main.rs:213:9:213:30 | ...::First(...) | main.rs:213:35:213:57 | ...::Second(...) | no-match |
516-
| main.rs:213:9:213:83 | [match(true)] ... \| ... | main.rs:214:16:214:24 | print_i64 | match |
517-
| main.rs:213:28:213:29 | a6 | main.rs:213:9:213:83 | [match(true)] ... \| ... | match |
516+
| main.rs:213:9:213:83 | ... \| ... | main.rs:214:16:214:24 | print_i64 | match |
517+
| main.rs:213:28:213:29 | a6 | main.rs:213:9:213:83 | ... \| ... | match |
518518
| main.rs:213:28:213:29 | a6 | main.rs:213:28:213:29 | a6 | |
519519
| main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:55:213:56 | a6 | match |
520520
| main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:61:213:82 | ...::Third(...) | no-match |
521-
| main.rs:213:35:213:82 | [match(true)] ... \| ... | main.rs:213:9:213:83 | [match(true)] ... \| ... | match |
522-
| main.rs:213:55:213:56 | a6 | main.rs:213:35:213:82 | [match(true)] ... \| ... | match |
521+
| main.rs:213:35:213:82 | ... \| ... | main.rs:213:9:213:83 | ... \| ... | match |
522+
| main.rs:213:55:213:56 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
523523
| main.rs:213:55:213:56 | a6 | main.rs:213:55:213:56 | a6 | |
524524
| main.rs:213:61:213:82 | ...::Third(...) | main.rs:213:80:213:81 | a6 | match |
525-
| main.rs:213:80:213:81 | a6 | main.rs:213:35:213:82 | [match(true)] ... \| ... | match |
525+
| main.rs:213:80:213:81 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
526526
| main.rs:213:80:213:81 | a6 | main.rs:213:80:213:81 | a6 | |
527527
| main.rs:214:16:214:24 | print_i64 | main.rs:214:26:214:27 | a6 | |
528528
| main.rs:214:16:214:28 | print_i64(...) | main.rs:212:5:215:5 | match tv { ... } | |
@@ -614,21 +614,21 @@ edges
614614
| main.rs:254:11:254:12 | fv | main.rs:255:9:255:30 | ...::First(...) | |
615615
| main.rs:255:9:255:30 | ...::First(...) | main.rs:255:27:255:29 | a13 | match |
616616
| main.rs:255:9:255:30 | ...::First(...) | main.rs:255:35:255:57 | ...::Second(...) | no-match |
617-
| main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | main.rs:256:16:256:24 | print_i64 | match |
618-
| main.rs:255:27:255:29 | a13 | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
617+
| main.rs:255:9:255:109 | ... \| ... \| ... | main.rs:256:16:256:24 | print_i64 | match |
618+
| main.rs:255:27:255:29 | a13 | main.rs:255:9:255:109 | ... \| ... \| ... | match |
619619
| main.rs:255:27:255:29 | a13 | main.rs:255:27:255:29 | a13 | |
620620
| main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:54:255:56 | a13 | match |
621621
| main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:61:255:82 | ...::Third(...) | no-match |
622622
| main.rs:255:35:255:82 | [match(false)] ... \| ... | main.rs:255:87:255:109 | ...::Fourth(...) | no-match |
623-
| main.rs:255:35:255:82 | [match(true)] ... \| ... | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
623+
| main.rs:255:35:255:82 | [match(true)] ... \| ... | main.rs:255:9:255:109 | ... \| ... \| ... | match |
624624
| main.rs:255:54:255:56 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
625625
| main.rs:255:54:255:56 | a13 | main.rs:255:54:255:56 | a13 | |
626626
| main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:35:255:82 | [match(false)] ... \| ... | no-match |
627627
| main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:79:255:81 | a13 | match |
628628
| main.rs:255:79:255:81 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
629629
| main.rs:255:79:255:81 | a13 | main.rs:255:79:255:81 | a13 | |
630630
| main.rs:255:87:255:109 | ...::Fourth(...) | main.rs:255:106:255:108 | a13 | match |
631-
| main.rs:255:106:255:108 | a13 | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
631+
| main.rs:255:106:255:108 | a13 | main.rs:255:9:255:109 | ... \| ... \| ... | match |
632632
| main.rs:255:106:255:108 | a13 | main.rs:255:106:255:108 | a13 | |
633633
| main.rs:256:16:256:24 | print_i64 | main.rs:256:26:256:28 | a13 | |
634634
| main.rs:256:16:256:29 | print_i64(...) | main.rs:254:5:257:5 | match fv { ... } | |
@@ -662,11 +662,11 @@ edges
662662
| main.rs:272:5:272:50 | ...: Either | main.rs:274:5:274:18 | ExprStmt | |
663663
| main.rs:272:6:272:21 | ...::Left(...) | main.rs:272:19:272:20 | a9 | match |
664664
| main.rs:272:6:272:21 | ...::Left(...) | main.rs:272:25:272:41 | ...::Right(...) | no-match |
665-
| main.rs:272:6:272:41 | [match(true)] ... \| ... | main.rs:272:5:272:50 | ...: Either | match |
666-
| main.rs:272:19:272:20 | a9 | main.rs:272:6:272:41 | [match(true)] ... \| ... | match |
665+
| main.rs:272:6:272:41 | ... \| ... | main.rs:272:5:272:50 | ...: Either | match |
666+
| main.rs:272:19:272:20 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
667667
| main.rs:272:19:272:20 | a9 | main.rs:272:19:272:20 | a9 | |
668668
| main.rs:272:25:272:41 | ...::Right(...) | main.rs:272:39:272:40 | a9 | match |
669-
| main.rs:272:39:272:40 | a9 | main.rs:272:6:272:41 | [match(true)] ... \| ... | match |
669+
| main.rs:272:39:272:40 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
670670
| main.rs:272:39:272:40 | a9 | main.rs:272:39:272:40 | a9 | |
671671
| main.rs:273:9:275:1 | { ... } | main.rs:271:1:275:1 | exit fn param_pattern2 (normal) | |
672672
| main.rs:274:5:274:13 | print_i64 | main.rs:274:15:274:16 | a9 | |

0 commit comments

Comments
 (0)