Skip to content

Commit 61866bf

Browse files
hvitvedhvitved
committed
update expected
1 parent 063aefe commit 61866bf

File tree

23 files changed

+84
-249
lines changed

23 files changed

+84
-249
lines changed

‎rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/TypeInferenceConsistency.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
illFormedTypeMention
2+
| gen_impl.rs:8:16:8:20 | SelfParam |

‎rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ localStep
914914
| main.rs:604:36:604:41 | [post] MacroExpr | main.rs:604:36:604:39 | [post] ...::new(...) |
915915
readStep
916916
| main.rs:50:9:50:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:50:14:50:14 | _ |
917-
| main.rs:104:11:104:11 | [post] receiver for i | file://:0:0:0:0 | &ref | main.rs:104:11:104:11 | [post] i |
918917
| main.rs:104:11:104:11 | i | file://:0:0:0:0 | &ref | main.rs:104:10:104:11 | * ... |
918+
| main.rs:104:11:104:11 | i | file://:0:0:0:0 | &ref | main.rs:104:11:104:11 | receiver for i |
919919
| main.rs:112:10:112:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:112:10:112:12 | a.0 |
920920
| main.rs:113:10:113:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:113:10:113:12 | a.1 |
921921
| main.rs:118:9:118:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:118:10:118:11 | a0 |
@@ -1011,27 +1011,31 @@ readStep
10111011
| main.rs:470:41:470:67 | [post] \|...\| ... | main.rs:467:9:467:20 | captured default_name | main.rs:470:41:470:67 | [post] default_name |
10121012
| main.rs:470:44:470:55 | this | main.rs:467:9:467:20 | captured default_name | main.rs:470:44:470:55 | default_name |
10131013
| main.rs:471:18:471:18 | [post] receiver for n | file://:0:0:0:0 | &ref | main.rs:471:18:471:18 | [post] n |
1014-
| main.rs:495:13:495:13 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:495:13:495:13 | [post] b |
1015-
| main.rs:496:18:496:18 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:496:18:496:18 | [post] b |
10161014
| main.rs:507:10:507:11 | vs | file://:0:0:0:0 | element | main.rs:507:10:507:14 | vs[0] |
10171015
| main.rs:508:11:508:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:10:508:35 | * ... |
1016+
| main.rs:508:11:508:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:11:508:35 | receiver for ... .unwrap() |
10181017
| main.rs:509:11:509:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:509:10:509:35 | * ... |
1018+
| main.rs:509:11:509:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:509:11:509:35 | receiver for ... .unwrap() |
10191019
| main.rs:511:14:511:15 | vs | file://:0:0:0:0 | element | main.rs:511:9:511:9 | v |
10201020
| main.rs:514:9:514:10 | &... | file://:0:0:0:0 | &ref | main.rs:514:10:514:10 | v |
10211021
| main.rs:514:15:514:23 | vs.iter() | file://:0:0:0:0 | element | main.rs:514:9:514:10 | &... |
10221022
| main.rs:519:9:519:10 | &... | file://:0:0:0:0 | &ref | main.rs:519:10:519:10 | v |
10231023
| main.rs:519:15:519:17 | vs2 | file://:0:0:0:0 | element | main.rs:519:9:519:10 | &... |
10241024
| main.rs:523:29:523:29 | x | file://:0:0:0:0 | &ref | main.rs:523:28:523:29 | * ... |
1025+
| main.rs:523:29:523:29 | x | file://:0:0:0:0 | &ref | main.rs:523:29:523:29 | receiver for x |
10251026
| main.rs:524:34:524:34 | x | file://:0:0:0:0 | &ref | main.rs:524:33:524:34 | * ... |
1027+
| main.rs:524:34:524:34 | x | file://:0:0:0:0 | &ref | main.rs:524:34:524:34 | receiver for x |
10261028
| main.rs:526:14:526:27 | vs.into_iter() | file://:0:0:0:0 | element | main.rs:526:9:526:9 | v |
10271029
| main.rs:532:10:532:15 | vs_mut | file://:0:0:0:0 | element | main.rs:532:10:532:18 | vs_mut[0] |
10281030
| main.rs:533:11:533:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:533:10:533:39 | * ... |
1031+
| main.rs:533:11:533:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:533:11:533:39 | receiver for ... .unwrap() |
10291032
| main.rs:534:11:534:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:534:10:534:39 | * ... |
1033+
| main.rs:534:11:534:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:534:11:534:39 | receiver for ... .unwrap() |
10301034
| main.rs:536:9:536:14 | &mut ... | file://:0:0:0:0 | &ref | main.rs:536:14:536:14 | v |
10311035
| main.rs:536:19:536:35 | vs_mut.iter_mut() | file://:0:0:0:0 | element | main.rs:536:9:536:14 | &mut ... |
10321036
| main.rs:550:11:550:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:550:10:550:15 | * ... |
1037+
| main.rs:550:11:550:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:550:11:550:15 | receiver for c_ref |
10331038
storeStep
1034-
| main.rs:104:11:104:11 | i | file://:0:0:0:0 | &ref | main.rs:104:11:104:11 | receiver for i |
10351039
| main.rs:111:14:111:22 | source(...) | file://:0:0:0:0 | tuple.0 | main.rs:111:13:111:26 | TupleExpr |
10361040
| main.rs:111:25:111:25 | 2 | file://:0:0:0:0 | tuple.1 | main.rs:111:13:111:26 | TupleExpr |
10371041
| main.rs:117:14:117:14 | 2 | file://:0:0:0:0 | tuple.0 | main.rs:117:13:117:30 | TupleExpr |
@@ -1112,8 +1116,6 @@ storeStep
11121116
| main.rs:458:18:458:27 | source(...) | file://:0:0:0:0 | element | main.rs:458:5:458:11 | [post] mut_arr |
11131117
| main.rs:470:41:470:67 | default_name | main.rs:467:9:467:20 | captured default_name | main.rs:470:41:470:67 | \|...\| ... |
11141118
| main.rs:471:18:471:18 | n | file://:0:0:0:0 | &ref | main.rs:471:18:471:18 | receiver for n |
1115-
| main.rs:495:13:495:13 | b | file://:0:0:0:0 | &ref | main.rs:495:13:495:13 | receiver for b |
1116-
| main.rs:496:18:496:18 | b | file://:0:0:0:0 | &ref | main.rs:496:18:496:18 | receiver for b |
11171119
| main.rs:505:15:505:24 | source(...) | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
11181120
| main.rs:505:27:505:27 | 2 | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |
11191121
| main.rs:505:30:505:30 | 3 | file://:0:0:0:0 | element | main.rs:505:14:505:34 | [...] |

‎rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
multipleCallTargets
2+
| main.rs:322:14:322:33 | ... .cmp(...) |
3+
| main.rs:334:9:334:28 | ... .cmp(...) |
24
| main.rs:362:14:362:30 | ... .lt(...) |

‎rust/ql/test/library-tests/dataflow/models/models.expected

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,6 @@ edges
291291
| main.rs:362:9:362:10 | x5 | main.rs:363:10:363:11 | x5 | provenance | |
292292
| main.rs:362:14:362:23 | source(...) | main.rs:362:14:362:30 | ... .lt(...) | provenance | MaD:9 |
293293
| main.rs:362:14:362:30 | ... .lt(...) | main.rs:362:9:362:10 | x5 | provenance | |
294-
| main.rs:365:9:365:10 | x6 | main.rs:366:10:366:11 | x6 | provenance | |
295-
| main.rs:365:14:365:23 | source(...) | main.rs:365:14:365:27 | ... < ... | provenance | MaD:9 |
296-
| main.rs:365:14:365:27 | ... < ... | main.rs:365:9:365:10 | x6 | provenance | |
297294
nodes
298295
| main.rs:15:9:15:9 | s | semmle.label | s |
299296
| main.rs:15:9:15:9 | s | semmle.label | s |
@@ -611,16 +608,13 @@ nodes
611608
| main.rs:362:14:362:23 | source(...) | semmle.label | source(...) |
612609
| main.rs:362:14:362:30 | ... .lt(...) | semmle.label | ... .lt(...) |
613610
| main.rs:363:10:363:11 | x5 | semmle.label | x5 |
614-
| main.rs:365:9:365:10 | x6 | semmle.label | x6 |
615-
| main.rs:365:14:365:23 | source(...) | semmle.label | source(...) |
616-
| main.rs:365:14:365:27 | ... < ... | semmle.label | ... < ... |
617-
| main.rs:366:10:366:11 | x6 | semmle.label | x6 |
618611
subpaths
619612
| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | main.rs:197:17:197:42 | if ... {...} else {...} | main.rs:198:13:198:24 | apply(...) |
620613
| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | main.rs:197:17:197:42 | if ... {...} else {...} | main.rs:198:13:198:24 | apply(...) |
621614
| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | main.rs:204:17:204:42 | if ... {...} else {...} | main.rs:205:13:205:23 | apply(...) |
622615
| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | main.rs:204:17:204:42 | if ... {...} else {...} | main.rs:205:13:205:23 | apply(...) |
623616
testFailures
617+
| main.rs:366:15:366:34 | //... | Missing result: hasTaintFlow=27 |
624618
invalidSpecComponent
625619
#select
626620
| main.rs:16:10:16:20 | identity(...) | main.rs:15:13:15:21 | source(...) | main.rs:16:10:16:20 | identity(...) | $@ | main.rs:15:13:15:21 | source(...) | source(...) |
@@ -675,4 +669,3 @@ invalidSpecComponent
675669
| main.rs:360:10:360:11 | x4 | main.rs:359:14:359:23 | source(...) | main.rs:360:10:360:11 | x4 | $@ | main.rs:359:14:359:23 | source(...) | source(...) |
676670
| main.rs:360:10:360:11 | x4 | main.rs:359:14:359:23 | source(...) | main.rs:360:10:360:11 | x4 | $@ | main.rs:359:14:359:23 | source(...) | source(...) |
677671
| main.rs:363:10:363:11 | x5 | main.rs:362:14:362:23 | source(...) | main.rs:363:10:363:11 | x5 | $@ | main.rs:362:14:362:23 | source(...) | source(...) |
678-
| main.rs:366:10:366:11 | x6 | main.rs:365:14:365:23 | source(...) | main.rs:366:10:366:11 | x6 | $@ | main.rs:365:14:365:23 | source(...) | source(...) |

‎rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ multipleCallTargets
1010
| test.rs:169:26:169:111 | ...::_print(...) |
1111
| test.rs:179:30:179:68 | ...::_print(...) |
1212
| test.rs:188:26:188:105 | ...::_print(...) |
13+
| test.rs:217:22:217:62 | ... .read_to_end(...) |
14+
| test.rs:223:22:223:65 | ... .read_to_string(...) |
1315
| test.rs:229:22:229:72 | ... .read_to_string(...) |
16+
| test.rs:235:9:235:48 | ... .read_exact(...) |
1417
| test.rs:513:22:513:50 | file.read_to_end(...) |
1518
| test.rs:519:22:519:53 | file.read_to_string(...) |
19+
| test.rs:639:26:639:43 | file1.chain(...) |
20+
| test.rs:647:26:647:40 | file1.take(...) |
1621
| test.rs:697:18:697:38 | ...::_print(...) |
1722
| test.rs:702:18:702:45 | ...::_print(...) |
1823
| test.rs:706:25:706:49 | address.to_socket_addrs() |
@@ -82,11 +87,5 @@ multipleCallTargets
8287
| test_futures_io.rs:93:26:93:63 | pinned.poll_read(...) |
8388
| test_futures_io.rs:116:22:116:50 | pinned.poll_fill_buf(...) |
8489
| test_futures_io.rs:145:26:145:49 | ...::with_capacity(...) |
85-
| web_frameworks.rs:13:14:13:22 | a.as_str() |
86-
| web_frameworks.rs:13:14:13:23 | a.as_str() |
87-
| web_frameworks.rs:14:14:14:24 | a.as_bytes() |
88-
| web_frameworks.rs:14:14:14:25 | a.as_bytes() |
89-
| web_frameworks.rs:101:14:101:23 | a.as_str() |
90-
| web_frameworks.rs:102:14:102:25 | a.as_bytes() |
91-
| web_frameworks.rs:158:14:158:23 | a.as_str() |
92-
| web_frameworks.rs:159:14:159:25 | a.as_bytes() |
90+
| web_frameworks.rs:40:5:40:26 | ...::write_str(...) |
91+
| web_frameworks.rs:40:5:40:26 | ...::write_str(...) |

‎rust/ql/test/library-tests/dataflow/sources/InlineFlow.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| test.rs:319:14:319:20 | &buffer | Fixed missing result: hasTaintFlow |
2+
| test.rs:326:14:326:20 | &buffer | Fixed missing result: hasTaintFlow |
3+
| test.rs:333:14:333:20 | &buffer | Fixed missing result: hasTaintFlow |
4+
| test.rs:592:14:592:20 | &buffer | Fixed missing result: hasTaintFlow="file.txt" |
5+
| test.rs:598:14:598:20 | &buffer | Fixed missing result: hasTaintFlow="file.txt" |
6+
| test.rs:604:14:604:20 | &buffer | Fixed missing result: hasTaintFlow="file.txt" |
7+
| test.rs:641:14:641:20 | &buffer | Fixed missing result: hasTaintFlow="another_file.txt" |
8+
| test.rs:641:14:641:20 | &buffer | Fixed missing result: hasTaintFlow="file.txt" |
9+
| test.rs:649:14:649:20 | &buffer | Fixed missing result: hasTaintFlow="file.txt" |
10+
| test_futures_io.rs:147:14:147:20 | &buffer | Fixed missing result: hasTaintFlow=url |

‎rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
multipleCallTargets
22
| main.rs:52:14:52:29 | ...::from(...) |
3-
| main.rs:64:16:64:25 | s.as_str() |

‎rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ models
22
| 1 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0]; ReturnValue; value |
33
| 2 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
44
| 3 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
5-
| 4 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
6-
| 5 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
7-
| 6 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
5+
| 4 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
6+
| 5 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
87
edges
98
| main.rs:26:9:26:9 | s | main.rs:27:19:27:25 | s[...] | provenance | |
109
| main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | s | provenance | |
@@ -24,37 +23,35 @@ edges
2423
| main.rs:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:1 |
2524
| main.rs:63:9:63:9 | s | main.rs:64:16:64:16 | s | provenance | |
2625
| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
27-
| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
2826
| main.rs:63:13:63:22 | source(...) | main.rs:63:9:63:9 | s | provenance | |
2927
| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
30-
| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
3128
| main.rs:68:9:68:9 | s | main.rs:70:34:70:61 | MacroExpr | provenance | |
3229
| main.rs:68:9:68:9 | s | main.rs:73:34:73:59 | MacroExpr | provenance | |
3330
| main.rs:68:13:68:22 | source(...) | main.rs:68:9:68:9 | s | provenance | |
3431
| main.rs:70:9:70:18 | formatted1 | main.rs:71:10:71:19 | formatted1 | provenance | |
3532
| main.rs:70:22:70:62 | ...::format(...) | main.rs:70:9:70:18 | formatted1 | provenance | |
36-
| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:5 |
33+
| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:4 |
3734
| main.rs:73:9:73:18 | formatted2 | main.rs:74:10:74:19 | formatted2 | provenance | |
3835
| main.rs:73:22:73:60 | ...::format(...) | main.rs:73:9:73:18 | formatted2 | provenance | |
39-
| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:5 |
36+
| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:4 |
4037
| main.rs:76:9:76:13 | width | main.rs:77:34:77:74 | MacroExpr | provenance | |
4138
| main.rs:76:17:76:32 | source_usize(...) | main.rs:76:9:76:13 | width | provenance | |
4239
| main.rs:77:9:77:18 | formatted3 | main.rs:78:10:78:19 | formatted3 | provenance | |
4340
| main.rs:77:22:77:75 | ...::format(...) | main.rs:77:9:77:18 | formatted3 | provenance | |
44-
| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:5 |
41+
| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:4 |
4542
| main.rs:82:9:82:10 | s1 | main.rs:86:18:86:25 | MacroExpr | provenance | |
4643
| main.rs:82:9:82:10 | s1 | main.rs:87:18:87:32 | MacroExpr | provenance | |
4744
| main.rs:82:14:82:23 | source(...) | main.rs:82:9:82:10 | s1 | provenance | |
4845
| main.rs:86:10:86:16 | res | main.rs:86:18:86:25 | { ... } | provenance | |
4946
| main.rs:86:18:86:25 | ...::format(...) | main.rs:86:10:86:16 | res | provenance | |
5047
| main.rs:86:18:86:25 | ...::must_use(...) | main.rs:86:10:86:26 | MacroExpr | provenance | |
51-
| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:5 |
52-
| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:6 |
48+
| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:4 |
49+
| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:5 |
5350
| main.rs:87:10:87:16 | res | main.rs:87:18:87:32 | { ... } | provenance | |
5451
| main.rs:87:18:87:32 | ...::format(...) | main.rs:87:10:87:16 | res | provenance | |
5552
| main.rs:87:18:87:32 | ...::must_use(...) | main.rs:87:10:87:33 | MacroExpr | provenance | |
56-
| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:5 |
57-
| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:6 |
53+
| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:4 |
54+
| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:5 |
5855
nodes
5956
| main.rs:26:9:26:9 | s | semmle.label | s |
6057
| main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |

0 commit comments

Comments
 (0)