Skip to content

Commit 2f87630

Browse files
aibaarsaibaars
committed
Rust: update expected output
1 parent a4b1c2b commit 2f87630

File tree

10 files changed

+95
-95
lines changed

10 files changed

+95
-95
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
| gen_break_expr.rs:7:13:7:17 | break | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no |
2-
| gen_break_expr.rs:12:13:12:27 | break ''label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
3-
| gen_break_expr.rs:17:13:17:27 | break ''label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
2+
| gen_break_expr.rs:12:13:12:27 | break 'label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
3+
| gen_break_expr.rs:17:13:17:27 | break 'label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |

‎rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_break_expr.rs:12:13:12:27 | break ''label 42 | gen_break_expr.rs:12:26:12:27 | 42 |
2-
| gen_break_expr.rs:17:13:17:27 | break ''label 42 | gen_break_expr.rs:17:26:17:27 | 42 |
1+
| gen_break_expr.rs:12:13:12:27 | break 'label 42 | gen_break_expr.rs:12:26:12:27 | 42 |
2+
| gen_break_expr.rs:17:13:17:27 | break 'label 42 | gen_break_expr.rs:17:26:17:27 | 42 |

‎rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_break_expr.rs:12:13:12:27 | break ''label 42 | gen_break_expr.rs:12:19:12:24 | ''label |
2-
| gen_break_expr.rs:17:13:17:27 | break ''label 42 | gen_break_expr.rs:17:19:17:24 | ''label |
1+
| gen_break_expr.rs:12:13:12:27 | break 'label 42 | gen_break_expr.rs:12:19:12:24 | 'label |
2+
| gen_break_expr.rs:17:13:17:27 | break 'label 42 | gen_break_expr.rs:17:19:17:24 | 'label |

‎rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| gen_continue_expr.rs:12:13:12:27 | continue 'label | gen_continue_expr.rs:12:22:12:27 | ''label |
1+
| gen_continue_expr.rs:12:13:12:27 | continue 'label | gen_continue_expr.rs:12:22:12:27 | 'label |

‎rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| gen_label.rs:5:5:5:11 | 'label | gen_label.rs:5:5:5:10 | ''label |
1+
| gen_label.rs:5:5:5:11 | 'label | gen_label.rs:5:5:5:10 | 'label |

‎rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| gen_self_param.rs:10:15:10:22 | SelfParam | gen_self_param.rs:10:16:10:17 | ''a |
1+
| gen_self_param.rs:10:15:10:22 | SelfParam | gen_self_param.rs:10:16:10:17 | 'a |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
| utf8_identifiers.rs:1:1:12:2 | SourceFile |
66
| utf8_identifiers.rs:1:4:1:6 | foo |
77
| utf8_identifiers.rs:1:7:4:1 | <...> |
8-
| utf8_identifiers.rs:2:5:2:6 | ''\u03b2 |
8+
| utf8_identifiers.rs:2:5:2:6 | '\u03b2 |
99
| utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
1010
| utf8_identifiers.rs:3:5:3:5 | \u03b3 |
1111
| utf8_identifiers.rs:3:5:3:5 | \u03b3 |

‎rust/ql/test/library-tests/controlflow/BasicBlocks.expected‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ edges
119119
| test.rs:49:24:51:17 | if b {...} | test.rs:47:17:51:17 | if b {...} else {...} | |
120120
| test.rs:49:27:49:27 | b | test.rs:49:24:51:17 | if b {...} | false |
121121
| test.rs:49:27:49:27 | b | test.rs:50:21:50:33 | ExprStmt | true |
122-
| test.rs:50:21:50:32 | break ''outer | test.rs:45:9:54:9 | 'outer: loop { ... } | break |
123-
| test.rs:50:21:50:33 | ExprStmt | test.rs:50:21:50:32 | break ''outer | |
124-
| test.rs:52:17:52:28 | break ''inner | test.rs:46:13:53:13 | 'inner: loop { ... } | break |
125-
| test.rs:52:17:52:29 | ExprStmt | test.rs:52:17:52:28 | break ''inner | |
122+
| test.rs:50:21:50:32 | break 'outer | test.rs:45:9:54:9 | 'outer: loop { ... } | break |
123+
| test.rs:50:21:50:33 | ExprStmt | test.rs:50:21:50:32 | break 'outer | |
124+
| test.rs:52:17:52:28 | break 'inner | test.rs:46:13:53:13 | 'inner: loop { ... } | break |
125+
| test.rs:52:17:52:29 | ExprStmt | test.rs:52:17:52:28 | break 'inner | |
126126
| test.rs:55:9:55:12 | true | test.rs:44:48:56:5 | { ... } | |
127127
| test.rs:58:5:70:5 | enter fn test_continue_with_labels | test.rs:58:34:58:34 | b | |
128128
| test.rs:58:34:58:34 | b | test.rs:58:34:58:34 | b | |
@@ -534,12 +534,12 @@ edges
534534
| test.rs:228:16:228:20 | ... > ... | test.rs:228:13:230:13 | if ... {...} | false |
535535
| test.rs:228:16:228:20 | ... > ... | test.rs:229:17:229:36 | ExprStmt | true |
536536
| test.rs:228:20:228:20 | 0 | test.rs:228:16:228:20 | ... > ... | |
537-
| test.rs:229:17:229:35 | [boolean(false)] break ''label ... | test.rs:227:13:232:9 | [boolean(false)] 'label: loop { ... } | break |
538-
| test.rs:229:17:229:35 | [boolean(true)] break ''label ... | test.rs:227:13:232:9 | [boolean(true)] 'label: loop { ... } | break |
537+
| test.rs:229:17:229:35 | [boolean(false)] break 'label ... | test.rs:227:13:232:9 | [boolean(false)] 'label: loop { ... } | break |
538+
| test.rs:229:17:229:35 | [boolean(true)] break 'label ... | test.rs:227:13:232:9 | [boolean(true)] 'label: loop { ... } | break |
539539
| test.rs:229:17:229:36 | ExprStmt | test.rs:229:30:229:30 | a | |
540540
| test.rs:229:30:229:30 | a | test.rs:229:34:229:35 | 10 | |
541-
| test.rs:229:30:229:35 | ... > ... | test.rs:229:17:229:35 | [boolean(false)] break ''label ... | false |
542-
| test.rs:229:30:229:35 | ... > ... | test.rs:229:17:229:35 | [boolean(true)] break ''label ... | true |
541+
| test.rs:229:30:229:35 | ... > ... | test.rs:229:17:229:35 | [boolean(false)] break 'label ... | false |
542+
| test.rs:229:30:229:35 | ... > ... | test.rs:229:17:229:35 | [boolean(true)] break 'label ... | true |
543543
| test.rs:229:34:229:35 | 10 | test.rs:229:30:229:35 | ... > ... | |
544544
| test.rs:231:13:231:13 | a | test.rs:231:17:231:18 | 10 | |
545545
| test.rs:231:13:231:18 | ... < ... | test.rs:227:26:232:9 | { ... } | |
@@ -558,12 +558,12 @@ edges
558558
| test.rs:240:9:246:9 | if ... {...} else {...} | test.rs:239:43:247:5 | { ... } | |
559559
| test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | test.rs:245:13:245:13 | 0 | false |
560560
| test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | test.rs:243:13:243:13 | 1 | true |
561-
| test.rs:241:13:241:30 | [boolean(false)] break ''block ... | test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | break |
562-
| test.rs:241:13:241:30 | [boolean(true)] break ''block ... | test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | break |
561+
| test.rs:241:13:241:30 | [boolean(false)] break 'block ... | test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | break |
562+
| test.rs:241:13:241:30 | [boolean(true)] break 'block ... | test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | break |
563563
| test.rs:241:13:241:31 | ExprStmt | test.rs:241:26:241:26 | a | |
564564
| test.rs:241:26:241:26 | a | test.rs:241:30:241:30 | 0 | |
565-
| test.rs:241:26:241:30 | ... > ... | test.rs:241:13:241:30 | [boolean(false)] break ''block ... | false |
566-
| test.rs:241:26:241:30 | ... > ... | test.rs:241:13:241:30 | [boolean(true)] break ''block ... | true |
565+
| test.rs:241:26:241:30 | ... > ... | test.rs:241:13:241:30 | [boolean(false)] break 'block ... | false |
566+
| test.rs:241:26:241:30 | ... > ... | test.rs:241:13:241:30 | [boolean(true)] break 'block ... | true |
567567
| test.rs:241:30:241:30 | 0 | test.rs:241:26:241:30 | ... > ... | |
568568
| test.rs:242:12:244:9 | { ... } | test.rs:240:9:246:9 | if ... {...} else {...} | |
569569
| test.rs:243:13:243:13 | 1 | test.rs:242:12:244:9 | { ... } | |
@@ -1364,9 +1364,9 @@ edges
13641364
| test.rs:571:12:571:28 | condition_not_met | test.rs:571:12:571:30 | condition_not_met(...) | |
13651365
| test.rs:571:12:571:30 | condition_not_met(...) | test.rs:571:9:573:9 | if ... {...} | false |
13661366
| test.rs:571:12:571:30 | condition_not_met(...) | test.rs:572:13:572:27 | ExprStmt | true |
1367-
| test.rs:572:13:572:26 | break ''block 1 | test.rs:569:18:580:5 | 'block: { ... } | break |
1367+
| test.rs:572:13:572:26 | break 'block 1 | test.rs:569:18:580:5 | 'block: { ... } | break |
13681368
| test.rs:572:13:572:27 | ExprStmt | test.rs:572:26:572:26 | 1 | |
1369-
| test.rs:572:26:572:26 | 1 | test.rs:572:13:572:26 | break ''block 1 | |
1369+
| test.rs:572:26:572:26 | 1 | test.rs:572:13:572:26 | break 'block 1 | |
13701370
| test.rs:574:9:574:21 | do_next_thing | test.rs:574:9:574:23 | do_next_thing(...) | |
13711371
| test.rs:574:9:574:23 | do_next_thing(...) | test.rs:575:9:577:9 | ExprStmt | |
13721372
| test.rs:574:9:574:24 | ExprStmt | test.rs:574:9:574:21 | do_next_thing | |
@@ -1375,9 +1375,9 @@ edges
13751375
| test.rs:575:12:575:28 | condition_not_met | test.rs:575:12:575:30 | condition_not_met(...) | |
13761376
| test.rs:575:12:575:30 | condition_not_met(...) | test.rs:575:9:577:9 | if ... {...} | false |
13771377
| test.rs:575:12:575:30 | condition_not_met(...) | test.rs:576:13:576:27 | ExprStmt | true |
1378-
| test.rs:576:13:576:26 | break ''block 2 | test.rs:569:18:580:5 | 'block: { ... } | break |
1378+
| test.rs:576:13:576:26 | break 'block 2 | test.rs:569:18:580:5 | 'block: { ... } | break |
13791379
| test.rs:576:13:576:27 | ExprStmt | test.rs:576:26:576:26 | 2 | |
1380-
| test.rs:576:26:576:26 | 2 | test.rs:576:13:576:26 | break ''block 2 | |
1380+
| test.rs:576:26:576:26 | 2 | test.rs:576:13:576:26 | break 'block 2 | |
13811381
| test.rs:578:9:578:21 | do_last_thing | test.rs:578:9:578:23 | do_last_thing(...) | |
13821382
| test.rs:578:9:578:23 | do_last_thing(...) | test.rs:579:9:579:9 | 3 | |
13831383
| test.rs:578:9:578:24 | ExprStmt | test.rs:578:9:578:21 | do_last_thing | |
@@ -1400,9 +1400,9 @@ edges
14001400
| test.rs:587:18:587:18 | y | test.rs:587:18:587:18 | y | |
14011401
| test.rs:587:18:587:18 | y | test.rs:590:9:590:9 | 0 | match |
14021402
| test.rs:587:23:587:23 | x | test.rs:587:13:587:19 | Some(...) | |
1403-
| test.rs:588:13:588:26 | break ''block 1 | test.rs:585:18:591:5 | 'block: { ... } | break |
1403+
| test.rs:588:13:588:26 | break 'block 1 | test.rs:585:18:591:5 | 'block: { ... } | break |
14041404
| test.rs:588:13:588:27 | ExprStmt | test.rs:588:26:588:26 | 1 | |
1405-
| test.rs:588:26:588:26 | 1 | test.rs:588:13:588:26 | break ''block 1 | |
1405+
| test.rs:588:26:588:26 | 1 | test.rs:588:13:588:26 | break 'block 1 | |
14061406
| test.rs:590:9:590:9 | 0 | test.rs:585:18:591:5 | 'block: { ... } | |
14071407
| test.rs:594:1:600:1 | enter fn test_nested_function2 | test.rs:595:5:595:18 | let ... = 0 | |
14081408
| test.rs:594:1:600:1 | exit fn test_nested_function2 (normal) | test.rs:594:1:600:1 | exit fn test_nested_function2 | |
@@ -1468,18 +1468,18 @@ edges
14681468
breakTarget
14691469
| test.rs:34:17:34:21 | break | test.rs:28:9:40:9 | loop { ... } |
14701470
| test.rs:48:21:48:25 | break | test.rs:46:13:53:13 | 'inner: loop { ... } |
1471-
| test.rs:50:21:50:32 | break ''outer | test.rs:45:9:54:9 | 'outer: loop { ... } |
1472-
| test.rs:52:17:52:28 | break ''inner | test.rs:46:13:53:13 | 'inner: loop { ... } |
1471+
| test.rs:50:21:50:32 | break 'outer | test.rs:45:9:54:9 | 'outer: loop { ... } |
1472+
| test.rs:52:17:52:28 | break 'inner | test.rs:46:13:53:13 | 'inner: loop { ... } |
14731473
| test.rs:91:17:91:21 | break | test.rs:88:9:94:9 | while b { ... } |
14741474
| test.rs:101:17:101:21 | break | test.rs:99:9:103:9 | while ... { ... } |
14751475
| test.rs:109:17:109:21 | break | test.rs:107:9:112:9 | for ... in ... { ... } |
14761476
| test.rs:117:13:117:26 | break ... | test.rs:116:9:118:9 | loop { ... } |
14771477
| test.rs:216:17:216:28 | break ... | test.rs:214:13:219:9 | loop { ... } |
1478-
| test.rs:229:17:229:35 | break ''label ... | test.rs:227:13:232:9 | 'label: loop { ... } |
1479-
| test.rs:241:13:241:30 | break ''block ... | test.rs:240:13:242:9 | 'block: { ... } |
1480-
| test.rs:572:13:572:26 | break ''block 1 | test.rs:569:18:580:5 | 'block: { ... } |
1481-
| test.rs:576:13:576:26 | break ''block 2 | test.rs:569:18:580:5 | 'block: { ... } |
1482-
| test.rs:588:13:588:26 | break ''block 1 | test.rs:585:18:591:5 | 'block: { ... } |
1478+
| test.rs:229:17:229:35 | break 'label ... | test.rs:227:13:232:9 | 'label: loop { ... } |
1479+
| test.rs:241:13:241:30 | break 'block ... | test.rs:240:13:242:9 | 'block: { ... } |
1480+
| test.rs:572:13:572:26 | break 'block 1 | test.rs:569:18:580:5 | 'block: { ... } |
1481+
| test.rs:576:13:576:26 | break 'block 2 | test.rs:569:18:580:5 | 'block: { ... } |
1482+
| test.rs:588:13:588:26 | break 'block 1 | test.rs:585:18:591:5 | 'block: { ... } |
14831483
continueTarget
14841484
| test.rs:37:17:37:24 | continue | test.rs:28:9:40:9 | loop { ... } |
14851485
| test.rs:63:21:63:28 | continue | test.rs:61:13:68:13 | 'inner: loop { ... } |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ localStep
9090
| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | [SSA] a |
9191
| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | a |
9292
| main.rs:66:13:71:5 | 'block: { ... } | main.rs:66:9:66:9 | a |
93-
| main.rs:68:13:68:26 | break ''block 1 | main.rs:66:13:71:5 | 'block: { ... } |
94-
| main.rs:68:26:68:26 | 1 | main.rs:68:13:68:26 | break ''block 1 |
93+
| main.rs:68:13:68:26 | break 'block 1 | main.rs:66:13:71:5 | 'block: { ... } |
94+
| main.rs:68:26:68:26 | 1 | main.rs:68:13:68:26 | break 'block 1 |
9595
| main.rs:70:9:70:9 | 2 | main.rs:66:13:71:5 | 'block: { ... } |
9696
| main.rs:72:5:72:5 | a | main.rs:65:38:73:1 | { ... } |
9797
| main.rs:75:22:75:22 | [SSA] b | main.rs:77:12:77:12 | b |
@@ -102,10 +102,10 @@ localStep
102102
| main.rs:76:9:76:9 | a | main.rs:76:9:76:9 | [SSA] a |
103103
| main.rs:76:9:76:9 | a | main.rs:76:9:76:9 | a |
104104
| main.rs:76:13:81:5 | 'block: { ... } | main.rs:76:9:76:9 | a |
105-
| main.rs:78:13:78:26 | break ''block 1 | main.rs:76:13:81:5 | 'block: { ... } |
106-
| main.rs:78:26:78:26 | 1 | main.rs:78:13:78:26 | break ''block 1 |
107-
| main.rs:80:9:80:22 | break ''block 2 | main.rs:76:13:81:5 | 'block: { ... } |
108-
| main.rs:80:22:80:22 | 2 | main.rs:80:9:80:22 | break ''block 2 |
105+
| main.rs:78:13:78:26 | break 'block 1 | main.rs:76:13:81:5 | 'block: { ... } |
106+
| main.rs:78:26:78:26 | 1 | main.rs:78:13:78:26 | break 'block 1 |
107+
| main.rs:80:9:80:22 | break 'block 2 | main.rs:76:13:81:5 | 'block: { ... } |
108+
| main.rs:80:22:80:22 | 2 | main.rs:80:9:80:22 | break 'block 2 |
109109
| main.rs:82:5:82:5 | a | main.rs:75:38:83:1 | { ... } |
110110
| main.rs:89:9:89:9 | [SSA] i | main.rs:90:11:90:11 | i |
111111
| main.rs:89:9:89:9 | i | main.rs:89:9:89:9 | [SSA] i |

0 commit comments

Comments
 (0)