Skip to content

Commit 57f3f3b

Browse files
aschackmullaschackmull
committed
Rust: Accept qltest changes.
1 parent 061f1a9 commit 57f3f3b

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ edges
8080
| test.rs:33:16:33:21 | ... == ... | test.rs:33:13:35:13 | if ... {...} | false |
8181
| test.rs:33:16:33:21 | ... == ... | test.rs:34:17:34:22 | ExprStmt | true |
8282
| test.rs:33:21:33:21 | 1 | test.rs:33:16:33:21 | ... == ... | |
83-
| test.rs:34:17:34:21 | break | test.rs:28:9:40:9 | loop { ... } | break |
83+
| test.rs:34:17:34:21 | break | test.rs:28:9:40:9 | loop { ... } | jump |
8484
| test.rs:34:17:34:22 | ExprStmt | test.rs:34:17:34:21 | break | |
8585
| test.rs:36:13:38:13 | ExprStmt | test.rs:36:16:36:16 | i | |
8686
| test.rs:36:13:38:13 | if ... {...} | test.rs:39:13:39:13 | i | |
@@ -90,7 +90,7 @@ edges
9090
| test.rs:36:16:36:25 | ... != ... | test.rs:37:17:37:25 | ExprStmt | true |
9191
| test.rs:36:20:36:20 | 2 | test.rs:36:16:36:20 | ... % ... | |
9292
| test.rs:36:25:36:25 | 0 | test.rs:36:16:36:25 | ... != ... | |
93-
| test.rs:37:17:37:24 | continue | test.rs:29:13:29:24 | ExprStmt | continue |
93+
| test.rs:37:17:37:24 | continue | test.rs:29:13:29:24 | ExprStmt | jump |
9494
| test.rs:37:17:37:25 | ExprStmt | test.rs:37:17:37:24 | continue | |
9595
| test.rs:39:13:39:13 | i | test.rs:39:17:39:17 | i | |
9696
| test.rs:39:13:39:21 | ... = ... | test.rs:28:14:40:9 | { ... } | |
@@ -114,14 +114,14 @@ edges
114114
| test.rs:47:17:51:17 | if b {...} else {...} | test.rs:52:17:52:29 | ExprStmt | |
115115
| test.rs:47:20:47:20 | b | test.rs:48:21:48:26 | ExprStmt | true |
116116
| test.rs:47:20:47:20 | b | test.rs:49:27:49:27 | b | false |
117-
| test.rs:48:21:48:25 | break | test.rs:46:13:53:13 | 'inner: loop { ... } | break |
117+
| test.rs:48:21:48:25 | break | test.rs:46:13:53:13 | 'inner: loop { ... } | jump |
118118
| test.rs:48:21:48:26 | ExprStmt | test.rs:48:21:48:25 | break | |
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 |
122+
| test.rs:50:21:50:32 | break 'outer | test.rs:45:9:54:9 | 'outer: loop { ... } | jump |
123123
| 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 |
124+
| test.rs:52:17:52:28 | break 'inner | test.rs:46:13:53:13 | 'inner: loop { ... } | jump |
125125
| 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 | |
@@ -134,14 +134,14 @@ edges
134134
| test.rs:62:17:66:17 | if b {...} else {...} | test.rs:67:17:67:32 | ExprStmt | |
135135
| test.rs:62:20:62:20 | b | test.rs:63:21:63:29 | ExprStmt | true |
136136
| test.rs:62:20:62:20 | b | test.rs:64:27:64:27 | b | false |
137-
| test.rs:63:21:63:28 | continue | test.rs:62:17:66:17 | ExprStmt | continue |
137+
| test.rs:63:21:63:28 | continue | test.rs:62:17:66:17 | ExprStmt | jump |
138138
| test.rs:63:21:63:29 | ExprStmt | test.rs:63:21:63:28 | continue | |
139139
| test.rs:64:24:66:17 | if b {...} | test.rs:62:17:66:17 | if b {...} else {...} | |
140140
| test.rs:64:27:64:27 | b | test.rs:64:24:66:17 | if b {...} | false |
141141
| test.rs:64:27:64:27 | b | test.rs:65:21:65:36 | ExprStmt | true |
142-
| test.rs:65:21:65:35 | continue 'outer | test.rs:60:13:60:14 | ExprStmt | continue |
142+
| test.rs:65:21:65:35 | continue 'outer | test.rs:60:13:60:14 | ExprStmt | jump |
143143
| test.rs:65:21:65:36 | ExprStmt | test.rs:65:21:65:35 | continue 'outer | |
144-
| test.rs:67:17:67:31 | continue 'inner | test.rs:62:17:66:17 | ExprStmt | continue |
144+
| test.rs:67:17:67:31 | continue 'inner | test.rs:62:17:66:17 | ExprStmt | jump |
145145
| test.rs:67:17:67:32 | ExprStmt | test.rs:67:17:67:31 | continue 'inner | |
146146
| test.rs:72:5:84:5 | enter fn test_loop_label_shadowing | test.rs:72:34:72:34 | b | |
147147
| test.rs:72:34:72:34 | b | test.rs:72:34:72:34 | b | |
@@ -153,14 +153,14 @@ edges
153153
| test.rs:76:17:80:17 | if b {...} else {...} | test.rs:81:17:81:32 | ExprStmt | |
154154
| test.rs:76:20:76:20 | b | test.rs:77:21:77:29 | ExprStmt | true |
155155
| test.rs:76:20:76:20 | b | test.rs:78:27:78:27 | b | false |
156-
| test.rs:77:21:77:28 | continue | test.rs:76:17:80:17 | ExprStmt | continue |
156+
| test.rs:77:21:77:28 | continue | test.rs:76:17:80:17 | ExprStmt | jump |
157157
| test.rs:77:21:77:29 | ExprStmt | test.rs:77:21:77:28 | continue | |
158158
| test.rs:78:24:80:17 | if b {...} | test.rs:76:17:80:17 | if b {...} else {...} | |
159159
| test.rs:78:27:78:27 | b | test.rs:78:24:80:17 | if b {...} | false |
160160
| test.rs:78:27:78:27 | b | test.rs:79:21:79:36 | ExprStmt | true |
161-
| test.rs:79:21:79:35 | continue 'label | test.rs:76:17:80:17 | ExprStmt | continue |
161+
| test.rs:79:21:79:35 | continue 'label | test.rs:76:17:80:17 | ExprStmt | jump |
162162
| test.rs:79:21:79:36 | ExprStmt | test.rs:79:21:79:35 | continue 'label | |
163-
| test.rs:81:17:81:31 | continue 'label | test.rs:76:17:80:17 | ExprStmt | continue |
163+
| test.rs:81:17:81:31 | continue 'label | test.rs:76:17:80:17 | ExprStmt | jump |
164164
| test.rs:81:17:81:32 | ExprStmt | test.rs:81:17:81:31 | continue 'label | |
165165
| test.rs:86:5:95:5 | enter fn test_while | test.rs:86:19:86:19 | i | |
166166
| test.rs:86:5:95:5 | exit fn test_while (normal) | test.rs:86:5:95:5 | exit fn test_while | |
@@ -184,7 +184,7 @@ edges
184184
| test.rs:90:17:90:21 | ... > ... | test.rs:90:13:92:13 | if ... {...} | false |
185185
| test.rs:90:17:90:21 | ... > ... | test.rs:91:17:91:22 | ExprStmt | true |
186186
| test.rs:90:21:90:21 | 0 | test.rs:90:17:90:21 | ... > ... | |
187-
| test.rs:91:17:91:21 | break | test.rs:88:9:94:9 | while b { ... } | break |
187+
| test.rs:91:17:91:21 | break | test.rs:88:9:94:9 | while b { ... } | jump |
188188
| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | break | |
189189
| test.rs:93:13:93:13 | b | test.rs:93:17:93:21 | false | |
190190
| test.rs:93:13:93:21 | ... = ... | test.rs:88:17:94:9 | { ... } | |
@@ -214,7 +214,7 @@ edges
214214
| test.rs:100:17:100:22 | ... == ... | test.rs:100:13:102:13 | if ... {...} | false |
215215
| test.rs:100:17:100:22 | ... == ... | test.rs:101:17:101:22 | ExprStmt | true |
216216
| test.rs:100:22:100:22 | 5 | test.rs:100:17:100:22 | ... == ... | |
217-
| test.rs:101:17:101:21 | break | test.rs:99:9:103:9 | while ... { ... } | break |
217+
| test.rs:101:17:101:21 | break | test.rs:99:9:103:9 | while ... { ... } | jump |
218218
| test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:21 | break | |
219219
| test.rs:106:5:113:5 | enter fn test_for | test.rs:106:17:106:17 | j | |
220220
| test.rs:106:5:113:5 | exit fn test_for (normal) | test.rs:106:5:113:5 | exit fn test_for | |
@@ -236,7 +236,7 @@ edges
236236
| test.rs:108:17:108:22 | ... == ... | test.rs:108:13:110:13 | if ... {...} | false |
237237
| test.rs:108:17:108:22 | ... == ... | test.rs:109:17:109:22 | ExprStmt | true |
238238
| test.rs:108:22:108:22 | j | test.rs:108:17:108:22 | ... == ... | |
239-
| test.rs:109:17:109:21 | break | test.rs:107:9:112:9 | for ... in ... { ... } | break |
239+
| test.rs:109:17:109:21 | break | test.rs:107:9:112:9 | for ... in ... { ... } | jump |
240240
| test.rs:109:17:109:22 | ExprStmt | test.rs:109:17:109:21 | break | |
241241
| test.rs:111:13:111:13 | 1 | test.rs:107:24:112:9 | { ... } | |
242242
| test.rs:111:13:111:14 | ExprStmt | test.rs:111:13:111:13 | 1 | |
@@ -506,8 +506,8 @@ edges
506506
| test.rs:215:16:215:20 | ... > ... | test.rs:215:13:217:13 | if ... {...} | false |
507507
| test.rs:215:16:215:20 | ... > ... | test.rs:216:17:216:29 | ExprStmt | true |
508508
| test.rs:215:20:215:20 | 0 | test.rs:215:16:215:20 | ... > ... | |
509-
| test.rs:216:17:216:28 | [boolean(false)] break ... | test.rs:214:13:219:9 | [boolean(false)] loop { ... } | break |
510-
| test.rs:216:17:216:28 | [boolean(true)] break ... | test.rs:214:13:219:9 | [boolean(true)] loop { ... } | break |
509+
| test.rs:216:17:216:28 | [boolean(false)] break ... | test.rs:214:13:219:9 | [boolean(false)] loop { ... } | jump |
510+
| test.rs:216:17:216:28 | [boolean(true)] break ... | test.rs:214:13:219:9 | [boolean(true)] loop { ... } | jump |
511511
| test.rs:216:17:216:29 | ExprStmt | test.rs:216:23:216:23 | a | |
512512
| test.rs:216:23:216:23 | a | test.rs:216:27:216:28 | 10 | |
513513
| test.rs:216:23:216:28 | ... > ... | test.rs:216:17:216:28 | [boolean(false)] break ... | false |
@@ -537,8 +537,8 @@ edges
537537
| test.rs:228:16:228:20 | ... > ... | test.rs:228:13:230:13 | if ... {...} | false |
538538
| test.rs:228:16:228:20 | ... > ... | test.rs:229:17:229:36 | ExprStmt | true |
539539
| test.rs:228:20:228:20 | 0 | test.rs:228:16:228:20 | ... > ... | |
540-
| test.rs:229:17:229:35 | [boolean(false)] break 'label ... | test.rs:227:13:232:9 | [boolean(false)] 'label: loop { ... } | break |
541-
| test.rs:229:17:229:35 | [boolean(true)] break 'label ... | test.rs:227:13:232:9 | [boolean(true)] 'label: loop { ... } | break |
540+
| test.rs:229:17:229:35 | [boolean(false)] break 'label ... | test.rs:227:13:232:9 | [boolean(false)] 'label: loop { ... } | jump |
541+
| test.rs:229:17:229:35 | [boolean(true)] break 'label ... | test.rs:227:13:232:9 | [boolean(true)] 'label: loop { ... } | jump |
542542
| test.rs:229:17:229:36 | ExprStmt | test.rs:229:30:229:30 | a | |
543543
| test.rs:229:30:229:30 | a | test.rs:229:34:229:35 | 10 | |
544544
| test.rs:229:30:229:35 | ... > ... | test.rs:229:17:229:35 | [boolean(false)] break 'label ... | false |
@@ -561,8 +561,8 @@ edges
561561
| test.rs:240:9:246:9 | if ... {...} else {...} | test.rs:239:43:247:5 | { ... } | |
562562
| test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | test.rs:245:13:245:13 | 0 | false |
563563
| test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | test.rs:243:13:243:13 | 1 | true |
564-
| test.rs:241:13:241:30 | [boolean(false)] break 'block ... | test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | break |
565-
| test.rs:241:13:241:30 | [boolean(true)] break 'block ... | test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | break |
564+
| test.rs:241:13:241:30 | [boolean(false)] break 'block ... | test.rs:240:13:242:9 | [boolean(false)] 'block: { ... } | jump |
565+
| test.rs:241:13:241:30 | [boolean(true)] break 'block ... | test.rs:240:13:242:9 | [boolean(true)] 'block: { ... } | jump |
566566
| test.rs:241:13:241:31 | ExprStmt | test.rs:241:26:241:26 | a | |
567567
| test.rs:241:26:241:26 | a | test.rs:241:30:241:30 | 0 | |
568568
| test.rs:241:26:241:30 | ... > ... | test.rs:241:13:241:30 | [boolean(false)] break 'block ... | false |
@@ -1365,7 +1365,7 @@ edges
13651365
| test.rs:571:12:571:28 | condition_not_met | test.rs:571:12:571:30 | condition_not_met(...) | |
13661366
| test.rs:571:12:571:30 | condition_not_met(...) | test.rs:571:9:573:9 | if ... {...} | false |
13671367
| test.rs:571:12:571:30 | condition_not_met(...) | test.rs:572:13:572:27 | ExprStmt | true |
1368-
| test.rs:572:13:572:26 | break 'block 1 | test.rs:569:18:580:5 | 'block: { ... } | break |
1368+
| test.rs:572:13:572:26 | break 'block 1 | test.rs:569:18:580:5 | 'block: { ... } | jump |
13691369
| test.rs:572:13:572:27 | ExprStmt | test.rs:572:26:572:26 | 1 | |
13701370
| test.rs:572:26:572:26 | 1 | test.rs:572:13:572:26 | break 'block 1 | |
13711371
| test.rs:574:9:574:21 | do_next_thing | test.rs:574:9:574:23 | do_next_thing(...) | |
@@ -1376,7 +1376,7 @@ edges
13761376
| test.rs:575:12:575:28 | condition_not_met | test.rs:575:12:575:30 | condition_not_met(...) | |
13771377
| test.rs:575:12:575:30 | condition_not_met(...) | test.rs:575:9:577:9 | if ... {...} | false |
13781378
| test.rs:575:12:575:30 | condition_not_met(...) | test.rs:576:13:576:27 | ExprStmt | true |
1379-
| test.rs:576:13:576:26 | break 'block 2 | test.rs:569:18:580:5 | 'block: { ... } | break |
1379+
| test.rs:576:13:576:26 | break 'block 2 | test.rs:569:18:580:5 | 'block: { ... } | jump |
13801380
| test.rs:576:13:576:27 | ExprStmt | test.rs:576:26:576:26 | 2 | |
13811381
| test.rs:576:26:576:26 | 2 | test.rs:576:13:576:26 | break 'block 2 | |
13821382
| test.rs:578:9:578:21 | do_last_thing | test.rs:578:9:578:23 | do_last_thing(...) | |
@@ -1401,7 +1401,7 @@ edges
14011401
| test.rs:587:18:587:18 | y | test.rs:587:18:587:18 | y | |
14021402
| test.rs:587:18:587:18 | y | test.rs:590:9:590:9 | 0 | match |
14031403
| test.rs:587:23:587:23 | x | test.rs:587:13:587:19 | Some(...) | |
1404-
| test.rs:588:13:588:26 | break 'block 1 | test.rs:585:18:591:5 | 'block: { ... } | break |
1404+
| test.rs:588:13:588:26 | break 'block 1 | test.rs:585:18:591:5 | 'block: { ... } | jump |
14051405
| test.rs:588:13:588:27 | ExprStmt | test.rs:588:26:588:26 | 1 | |
14061406
| test.rs:588:26:588:26 | 1 | test.rs:588:13:588:26 | break 'block 1 | |
14071407
| test.rs:590:9:590:9 | 0 | test.rs:585:18:591:5 | 'block: { ... } | |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ edges
772772
| main.rs:323:9:323:20 | print_i64(...) | main.rs:324:9:324:14 | ExprStmt | |
773773
| main.rs:323:9:323:21 | ExprStmt | main.rs:323:9:323:17 | print_i64 | |
774774
| main.rs:323:19:323:19 | x | main.rs:323:9:323:20 | print_i64(...) | |
775-
| main.rs:324:9:324:13 | break | main.rs:315:5:325:5 | while ... { ... } | break |
775+
| main.rs:324:9:324:13 | break | main.rs:315:5:325:5 | while ... { ... } | jump |
776776
| main.rs:324:9:324:14 | ExprStmt | main.rs:324:9:324:13 | break | |
777777
| main.rs:327:5:327:13 | print_i64 | main.rs:327:15:327:15 | x | |
778778
| main.rs:327:5:327:25 | print_i64(...) | main.rs:313:22:328:1 | { ... } | |

0 commit comments

Comments
 (0)