Skip to content

Commit aa82695

Browse files
hvitvedhvitved
committed
Rust: Update expected test output
1 parent a97a631 commit aa82695

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‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -401,12 +401,12 @@ localStep
401401
| main.rs:304:11:304:12 | s1 | main.rs:305:9:305:45 | ... \| ... | |
402402
| main.rs:305:9:305:45 | ... \| ... | main.rs:305:9:305:25 | ...::A(...) | |
403403
| main.rs:305:9:305:45 | ... \| ... | main.rs:305:29:305:45 | ...::B(...) | |
404-
| main.rs:305:9:305:45 | [SSA] [match(true)] phi | main.rs:305:55:305:55 | n | |
405-
| main.rs:305:24:305:24 | [SSA] [input] [match(true)] phi | main.rs:305:9:305:45 | [SSA] [match(true)] phi | |
406-
| main.rs:305:24:305:24 | [SSA] n | main.rs:305:24:305:24 | [SSA] [input] [match(true)] phi | |
404+
| main.rs:305:9:305:45 | [SSA] phi | main.rs:305:55:305:55 | n | |
405+
| main.rs:305:24:305:24 | [SSA] [input] phi | main.rs:305:9:305:45 | [SSA] phi | |
406+
| main.rs:305:24:305:24 | [SSA] n | main.rs:305:24:305:24 | [SSA] [input] phi | |
407407
| main.rs:305:24:305:24 | n | main.rs:305:24:305:24 | [SSA] n | |
408-
| main.rs:305:44:305:44 | [SSA] [input] [match(true)] phi | main.rs:305:9:305:45 | [SSA] [match(true)] phi | |
409-
| main.rs:305:44:305:44 | [SSA] n | main.rs:305:44:305:44 | [SSA] [input] [match(true)] phi | |
408+
| main.rs:305:44:305:44 | [SSA] [input] phi | main.rs:305:9:305:45 | [SSA] phi | |
409+
| main.rs:305:44:305:44 | [SSA] n | main.rs:305:44:305:44 | [SSA] [input] phi | |
410410
| main.rs:305:44:305:44 | n | main.rs:305:44:305:44 | [SSA] n | |
411411
| main.rs:305:50:305:56 | sink(...) | main.rs:304:5:306:5 | match s1 { ... } | |
412412
| main.rs:307:5:310:5 | match s2 { ... } | main.rs:297:48:311:1 | { ... } | |
@@ -436,12 +436,12 @@ localStep
436436
| main.rs:322:11:322:12 | s1 | main.rs:323:9:323:19 | ... \| ... | |
437437
| main.rs:323:9:323:19 | ... \| ... | main.rs:323:9:323:12 | A(...) | |
438438
| main.rs:323:9:323:19 | ... \| ... | main.rs:323:16:323:19 | B(...) | |
439-
| main.rs:323:9:323:19 | [SSA] [match(true)] phi | main.rs:323:29:323:29 | n | |
440-
| main.rs:323:11:323:11 | [SSA] [input] [match(true)] phi | main.rs:323:9:323:19 | [SSA] [match(true)] phi | |
441-
| main.rs:323:11:323:11 | [SSA] n | main.rs:323:11:323:11 | [SSA] [input] [match(true)] phi | |
439+
| main.rs:323:9:323:19 | [SSA] phi | main.rs:323:29:323:29 | n | |
440+
| main.rs:323:11:323:11 | [SSA] [input] phi | main.rs:323:9:323:19 | [SSA] phi | |
441+
| main.rs:323:11:323:11 | [SSA] n | main.rs:323:11:323:11 | [SSA] [input] phi | |
442442
| main.rs:323:11:323:11 | n | main.rs:323:11:323:11 | [SSA] n | |
443-
| main.rs:323:18:323:18 | [SSA] [input] [match(true)] phi | main.rs:323:9:323:19 | [SSA] [match(true)] phi | |
444-
| main.rs:323:18:323:18 | [SSA] n | main.rs:323:18:323:18 | [SSA] [input] [match(true)] phi | |
443+
| main.rs:323:18:323:18 | [SSA] [input] phi | main.rs:323:9:323:19 | [SSA] phi | |
444+
| main.rs:323:18:323:18 | [SSA] n | main.rs:323:18:323:18 | [SSA] [input] phi | |
445445
| main.rs:323:18:323:18 | n | main.rs:323:18:323:18 | [SSA] n | |
446446
| main.rs:323:24:323:30 | sink(...) | main.rs:322:5:324:5 | match s1 { ... } | |
447447
| main.rs:325:5:328:5 | match s2 { ... } | main.rs:315:50:329:1 | { ... } | |
@@ -471,12 +471,12 @@ localStep
471471
| main.rs:345:11:345:12 | s1 | main.rs:346:9:346:71 | ... \| ... | |
472472
| main.rs:346:9:346:71 | ... \| ... | main.rs:346:9:346:38 | ...::C {...} | |
473473
| main.rs:346:9:346:71 | ... \| ... | main.rs:346:42:346:71 | ...::D {...} | |
474-
| main.rs:346:9:346:71 | [SSA] [match(true)] phi | main.rs:346:81:346:81 | n | |
475-
| main.rs:346:36:346:36 | [SSA] [input] [match(true)] phi | main.rs:346:9:346:71 | [SSA] [match(true)] phi | |
476-
| main.rs:346:36:346:36 | [SSA] n | main.rs:346:36:346:36 | [SSA] [input] [match(true)] phi | |
474+
| main.rs:346:9:346:71 | [SSA] phi | main.rs:346:81:346:81 | n | |
475+
| main.rs:346:36:346:36 | [SSA] [input] phi | main.rs:346:9:346:71 | [SSA] phi | |
476+
| main.rs:346:36:346:36 | [SSA] n | main.rs:346:36:346:36 | [SSA] [input] phi | |
477477
| main.rs:346:36:346:36 | n | main.rs:346:36:346:36 | [SSA] n | |
478-
| main.rs:346:69:346:69 | [SSA] [input] [match(true)] phi | main.rs:346:9:346:71 | [SSA] [match(true)] phi | |
479-
| main.rs:346:69:346:69 | [SSA] n | main.rs:346:69:346:69 | [SSA] [input] [match(true)] phi | |
478+
| main.rs:346:69:346:69 | [SSA] [input] phi | main.rs:346:9:346:71 | [SSA] phi | |
479+
| main.rs:346:69:346:69 | [SSA] n | main.rs:346:69:346:69 | [SSA] [input] phi | |
480480
| main.rs:346:69:346:69 | n | main.rs:346:69:346:69 | [SSA] n | |
481481
| main.rs:346:76:346:82 | sink(...) | main.rs:345:5:347:5 | match s1 { ... } | |
482482
| main.rs:348:5:351:5 | match s2 { ... } | main.rs:336:49:352:1 | { ... } | |
@@ -506,12 +506,12 @@ localStep
506506
| main.rs:365:11:365:12 | s1 | main.rs:366:9:366:43 | ... \| ... | |
507507
| main.rs:366:9:366:43 | ... \| ... | main.rs:366:9:366:24 | C {...} | |
508508
| main.rs:366:9:366:43 | ... \| ... | main.rs:366:28:366:43 | D {...} | |
509-
| main.rs:366:9:366:43 | [SSA] [match(true)] phi | main.rs:366:53:366:53 | n | |
510-
| main.rs:366:22:366:22 | [SSA] [input] [match(true)] phi | main.rs:366:9:366:43 | [SSA] [match(true)] phi | |
511-
| main.rs:366:22:366:22 | [SSA] n | main.rs:366:22:366:22 | [SSA] [input] [match(true)] phi | |
509+
| main.rs:366:9:366:43 | [SSA] phi | main.rs:366:53:366:53 | n | |
510+
| main.rs:366:22:366:22 | [SSA] [input] phi | main.rs:366:9:366:43 | [SSA] phi | |
511+
| main.rs:366:22:366:22 | [SSA] n | main.rs:366:22:366:22 | [SSA] [input] phi | |
512512
| main.rs:366:22:366:22 | n | main.rs:366:22:366:22 | [SSA] n | |
513-
| main.rs:366:41:366:41 | [SSA] [input] [match(true)] phi | main.rs:366:9:366:43 | [SSA] [match(true)] phi | |
514-
| main.rs:366:41:366:41 | [SSA] n | main.rs:366:41:366:41 | [SSA] [input] [match(true)] phi | |
513+
| main.rs:366:41:366:41 | [SSA] [input] phi | main.rs:366:9:366:43 | [SSA] phi | |
514+
| main.rs:366:41:366:41 | [SSA] n | main.rs:366:41:366:41 | [SSA] [input] phi | |
515515
| main.rs:366:41:366:41 | n | main.rs:366:41:366:41 | [SSA] n | |
516516
| main.rs:366:48:366:54 | sink(...) | main.rs:365:5:367:5 | match s1 { ... } | |
517517
| main.rs:368:5:371:5 | match s2 { ... } | main.rs:356:51:372:1 | { ... } | |

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,10 @@ edges
414414
| main.rs:190:11:190:16 | either | main.rs:191:9:191:24 | ...::Left(...) | |
415415
| main.rs:191:9:191:24 | ...::Left(...) | main.rs:191:22:191:23 | a3 | match |
416416
| main.rs:191:9:191:24 | ...::Left(...) | main.rs:191:28:191:44 | ...::Right(...) | no-match |
417-
| main.rs:191:9:191:44 | [match(true)] ... \| ... | main.rs:192:16:192:24 | print_i64 | match |
418-
| main.rs:191:22:191:23 | a3 | main.rs:191:9:191:44 | [match(true)] ... \| ... | match |
417+
| main.rs:191:9:191:44 | ... \| ... | main.rs:192:16:192:24 | print_i64 | match |
418+
| main.rs:191:22:191:23 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
419419
| main.rs:191:28:191:44 | ...::Right(...) | main.rs:191:42:191:43 | a3 | match |
420-
| main.rs:191:42:191:43 | a3 | main.rs:191:9:191:44 | [match(true)] ... \| ... | match |
420+
| main.rs:191:42:191:43 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
421421
| main.rs:192:16:192:24 | print_i64 | main.rs:192:26:192:27 | a3 | |
422422
| main.rs:192:16:192:28 | print_i64(...) | main.rs:190:5:193:5 | match either { ... } | |
423423
| main.rs:192:26:192:27 | a3 | main.rs:192:16:192:28 | print_i64(...) | |
@@ -434,45 +434,45 @@ edges
434434
| main.rs:204:11:204:12 | tv | main.rs:205:9:205:30 | ...::First(...) | |
435435
| main.rs:205:9:205:30 | ...::First(...) | main.rs:205:28:205:29 | a4 | match |
436436
| main.rs:205:9:205:30 | ...::First(...) | main.rs:205:34:205:56 | ...::Second(...) | no-match |
437-
| main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | main.rs:206:16:206:24 | print_i64 | match |
438-
| main.rs:205:28:205:29 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
437+
| main.rs:205:9:205:81 | ... \| ... \| ... | main.rs:206:16:206:24 | print_i64 | match |
438+
| main.rs:205:28:205:29 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
439439
| main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:54:205:55 | a4 | match |
440440
| main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:60:205:81 | ...::Third(...) | no-match |
441-
| main.rs:205:54:205:55 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
441+
| main.rs:205:54:205:55 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
442442
| main.rs:205:60:205:81 | ...::Third(...) | main.rs:205:79:205:80 | a4 | match |
443-
| main.rs:205:79:205:80 | a4 | main.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
443+
| main.rs:205:79:205:80 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
444444
| main.rs:206:16:206:24 | print_i64 | main.rs:206:26:206:27 | a4 | |
445445
| main.rs:206:16:206:28 | print_i64(...) | main.rs:204:5:207:5 | match tv { ... } | |
446446
| main.rs:206:26:206:27 | a4 | main.rs:206:16:206:28 | print_i64(...) | |
447447
| main.rs:208:5:211:5 | ExprStmt | main.rs:208:11:208:12 | tv | |
448448
| main.rs:208:5:211:5 | match tv { ... } | main.rs:212:11:212:12 | tv | |
449449
| main.rs:208:11:208:12 | tv | main.rs:209:10:209:31 | ...::First(...) | |
450-
| main.rs:209:9:209:83 | [match(true)] ... \| ... | main.rs:210:16:210:24 | print_i64 | match |
450+
| main.rs:209:9:209:83 | ... \| ... | main.rs:210:16:210:24 | print_i64 | match |
451451
| main.rs:209:10:209:31 | ...::First(...) | main.rs:209:29:209:30 | a5 | match |
452452
| main.rs:209:10:209:31 | ...::First(...) | main.rs:209:35:209:57 | ...::Second(...) | no-match |
453453
| main.rs:209:10:209:57 | [match(false)] ... \| ... | main.rs:209:62:209:83 | ...::Third(...) | no-match |
454-
| main.rs:209:10:209:57 | [match(true)] ... \| ... | main.rs:209:9:209:83 | [match(true)] ... \| ... | match |
454+
| main.rs:209:10:209:57 | [match(true)] ... \| ... | main.rs:209:9:209:83 | ... \| ... | match |
455455
| main.rs:209:29:209:30 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
456456
| main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:10:209:57 | [match(false)] ... \| ... | no-match |
457457
| main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:55:209:56 | a5 | match |
458458
| main.rs:209:55:209:56 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
459459
| main.rs:209:62:209:83 | ...::Third(...) | main.rs:209:81:209:82 | a5 | match |
460-
| main.rs:209:81:209:82 | a5 | main.rs:209:9:209:83 | [match(true)] ... \| ... | match |
460+
| main.rs:209:81:209:82 | a5 | main.rs:209:9:209:83 | ... \| ... | match |
461461
| main.rs:210:16:210:24 | print_i64 | main.rs:210:26:210:27 | a5 | |
462462
| main.rs:210:16:210:28 | print_i64(...) | main.rs:208:5:211:5 | match tv { ... } | |
463463
| main.rs:210:26:210:27 | a5 | main.rs:210:16:210:28 | print_i64(...) | |
464464
| main.rs:212:5:215:5 | match tv { ... } | main.rs:202:21:216:1 | { ... } | |
465465
| main.rs:212:11:212:12 | tv | main.rs:213:9:213:30 | ...::First(...) | |
466466
| main.rs:213:9:213:30 | ...::First(...) | main.rs:213:28:213:29 | a6 | match |
467467
| main.rs:213:9:213:30 | ...::First(...) | main.rs:213:35:213:57 | ...::Second(...) | no-match |
468-
| main.rs:213:9:213:83 | [match(true)] ... \| ... | main.rs:214:16:214:24 | print_i64 | match |
469-
| main.rs:213:28:213:29 | a6 | main.rs:213:9:213:83 | [match(true)] ... \| ... | match |
468+
| main.rs:213:9:213:83 | ... \| ... | main.rs:214:16:214:24 | print_i64 | match |
469+
| main.rs:213:28:213:29 | a6 | main.rs:213:9:213:83 | ... \| ... | match |
470470
| main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:55:213:56 | a6 | match |
471471
| main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:61:213:82 | ...::Third(...) | no-match |
472-
| main.rs:213:35:213:82 | [match(true)] ... \| ... | main.rs:213:9:213:83 | [match(true)] ... \| ... | match |
473-
| main.rs:213:55:213:56 | a6 | main.rs:213:35:213:82 | [match(true)] ... \| ... | match |
472+
| main.rs:213:35:213:82 | ... \| ... | main.rs:213:9:213:83 | ... \| ... | match |
473+
| main.rs:213:55:213:56 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
474474
| main.rs:213:61:213:82 | ...::Third(...) | main.rs:213:80:213:81 | a6 | match |
475-
| main.rs:213:80:213:81 | a6 | main.rs:213:35:213:82 | [match(true)] ... \| ... | match |
475+
| main.rs:213:80:213:81 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
476476
| main.rs:214:16:214:24 | print_i64 | main.rs:214:26:214:27 | a6 | |
477477
| main.rs:214:16:214:28 | print_i64(...) | main.rs:212:5:215:5 | match tv { ... } | |
478478
| main.rs:214:26:214:27 | a6 | main.rs:214:16:214:28 | print_i64(...) | |
@@ -553,18 +553,18 @@ edges
553553
| main.rs:254:11:254:12 | fv | main.rs:255:9:255:30 | ...::First(...) | |
554554
| main.rs:255:9:255:30 | ...::First(...) | main.rs:255:27:255:29 | a13 | match |
555555
| main.rs:255:9:255:30 | ...::First(...) | main.rs:255:35:255:57 | ...::Second(...) | no-match |
556-
| main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | main.rs:256:16:256:24 | print_i64 | match |
557-
| main.rs:255:27:255:29 | a13 | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
556+
| main.rs:255:9:255:109 | ... \| ... \| ... | main.rs:256:16:256:24 | print_i64 | match |
557+
| main.rs:255:27:255:29 | a13 | main.rs:255:9:255:109 | ... \| ... \| ... | match |
558558
| main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:54:255:56 | a13 | match |
559559
| main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:61:255:82 | ...::Third(...) | no-match |
560560
| main.rs:255:35:255:82 | [match(false)] ... \| ... | main.rs:255:87:255:109 | ...::Fourth(...) | no-match |
561-
| main.rs:255:35:255:82 | [match(true)] ... \| ... | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
561+
| main.rs:255:35:255:82 | [match(true)] ... \| ... | main.rs:255:9:255:109 | ... \| ... \| ... | match |
562562
| main.rs:255:54:255:56 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
563563
| main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:35:255:82 | [match(false)] ... \| ... | no-match |
564564
| main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:79:255:81 | a13 | match |
565565
| main.rs:255:79:255:81 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
566566
| main.rs:255:87:255:109 | ...::Fourth(...) | main.rs:255:106:255:108 | a13 | match |
567-
| main.rs:255:106:255:108 | a13 | main.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
567+
| main.rs:255:106:255:108 | a13 | main.rs:255:9:255:109 | ... \| ... \| ... | match |
568568
| main.rs:256:16:256:24 | print_i64 | main.rs:256:26:256:28 | a13 | |
569569
| main.rs:256:16:256:29 | print_i64(...) | main.rs:254:5:257:5 | match fv { ... } | |
570570
| main.rs:256:26:256:28 | a13 | main.rs:256:16:256:29 | print_i64(...) | |
@@ -594,10 +594,10 @@ edges
594594
| main.rs:272:5:272:50 | ...: Either | main.rs:274:5:274:18 | ExprStmt | |
595595
| main.rs:272:6:272:21 | ...::Left(...) | main.rs:272:19:272:20 | a9 | match |
596596
| main.rs:272:6:272:21 | ...::Left(...) | main.rs:272:25:272:41 | ...::Right(...) | no-match |
597-
| main.rs:272:6:272:41 | [match(true)] ... \| ... | main.rs:272:5:272:50 | ...: Either | match |
598-
| main.rs:272:19:272:20 | a9 | main.rs:272:6:272:41 | [match(true)] ... \| ... | match |
597+
| main.rs:272:6:272:41 | ... \| ... | main.rs:272:5:272:50 | ...: Either | match |
598+
| main.rs:272:19:272:20 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
599599
| main.rs:272:25:272:41 | ...::Right(...) | main.rs:272:39:272:40 | a9 | match |
600-
| main.rs:272:39:272:40 | a9 | main.rs:272:6:272:41 | [match(true)] ... \| ... | match |
600+
| main.rs:272:39:272:40 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
601601
| main.rs:273:9:275:1 | { ... } | main.rs:271:1:275:1 | exit fn param_pattern2 (normal) | |
602602
| main.rs:274:5:274:13 | print_i64 | main.rs:274:15:274:16 | a9 | |
603603
| main.rs:274:5:274:17 | print_i64(...) | main.rs:273:9:275:1 | { ... } | |

0 commit comments

Comments
 (0)