Skip to content

Commit 84de91b

Browse files
redsun82redsun82
committed
Rust: accept test changes
1 parent 8f9c031 commit 84de91b

27 files changed

Lines changed: 360 additions & 143 deletions

‎rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
extractionWarning
22
| included/included.rs:1:1:1:1 | semantic analyzer unavailable (not loaded as its own module, probably included by `!include`) |
3+
| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@ dominates
730730
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
731731
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} |
732732
| test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
733+
| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
733734
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
734735
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt |
735736
| test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1396,6 +1397,7 @@ postDominance
13961397
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
13971398
| test.rs:541:9:546:9 | if false {...} | test.rs:539:5:548:5 | enter fn const_block_panic |
13981399
| test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
1400+
| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
13991401
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
14001402
| test.rs:553:9:553:17 | ExprStmt | test.rs:551:1:556:1 | enter fn dead_code |
14011403
| test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,11 @@ edges
13211321
| test.rs:541:9:546:9 | ExprStmt | test.rs:541:12:541:16 | false | |
13221322
| test.rs:541:9:546:9 | if false {...} | test.rs:547:9:547:9 | N | |
13231323
| test.rs:541:12:541:16 | false | test.rs:541:9:546:9 | if false {...} | false |
1324+
| test.rs:544:17:544:24 | ...::panic_explicit | test.rs:544:17:544:24 | ...::panic_explicit(...) | |
1325+
| test.rs:544:17:544:24 | ...::panic_explicit(...) | test.rs:544:17:544:24 | { ... } | |
1326+
| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | ...::panic_explicit | |
1327+
| test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:24 | exit fn panic_cold_explicit | |
1328+
| test.rs:544:17:544:24 | { ... } | test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) | |
13241329
| test.rs:547:9:547:9 | N | test.rs:539:35:548:5 | { ... } | |
13251330
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:552:5:554:5 | ExprStmt | |
13261331
| test.rs:551:1:556:1 | exit fn dead_code (normal) | test.rs:551:1:556:1 | exit fn dead_code | |

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
multiplePathResolutions
2+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
3+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
4+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
5+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
6+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
7+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
8+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
9+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
10+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
11+
| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
12+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
13+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
14+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
15+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
16+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
17+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
18+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
19+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
20+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
21+
| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |

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

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

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ multiplePathResolutions
2727
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
2828
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
2929
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
30+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
31+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
32+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
33+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
34+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
35+
| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
36+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
37+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
38+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
39+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
40+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
41+
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
3042
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
3143
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
3244
| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
@@ -48,6 +60,27 @@ multiplePathResolutions
4860
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
4961
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
5062
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
63+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
64+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
65+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
66+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
67+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
68+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
69+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
70+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
71+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
72+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
73+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
74+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
75+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
76+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
77+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
78+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
79+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
80+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
81+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
82+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
83+
| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
5184
| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
5285
| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
5386
| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
1-
| test.rs:63:27:63:57 | //... | Missing result: hasTaintFlow="example.com" |
2-
| test.rs:66:27:66:57 | //... | Missing result: hasTaintFlow="example.com" |
3-
| test.rs:69:27:69:57 | //... | Missing result: hasTaintFlow="example.com" |
4-
| test.rs:72:27:72:57 | //... | Missing result: hasTaintFlow="example.com" |
5-
| test.rs:75:27:75:57 | //... | Missing result: hasTaintFlow="example.com" |
6-
| test.rs:78:27:78:57 | //... | Missing result: hasTaintFlow="example.com" |
7-
| test.rs:81:45:81:75 | //... | Missing result: hasTaintFlow="example.com" |
8-
| test.rs:365:22:365:38 | //... | Missing result: hasTaintFlow |
9-
| test.rs:686:25:686:49 | //... | Missing result: hasTaintFlow=address |
10-
| test.rs:687:27:687:51 | //... | Missing result: hasTaintFlow=address |
11-
| test.rs:706:36:706:60 | //... | Missing result: hasTaintFlow=address |
12-
| test.rs:729:36:729:60 | //... | Missing result: hasTaintFlow=address |
1+

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,15 @@
7878
| test.rs:753:22:753:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
7979
| test.rs:779:22:779:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
8080
| test.rs:806:16:806:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
81+
| test.rs:806:16:806:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
8182
| test_futures_io.rs:19:15:19:32 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
8283
| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
84+
| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
85+
| web_frameworks.rs:22:14:22:18 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
8386
| web_frameworks.rs:22:14:22:19 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
87+
| web_frameworks.rs:48:14:48:28 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
8488
| web_frameworks.rs:48:14:48:30 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
8589
| web_frameworks.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
90+
| web_frameworks.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
91+
| web_frameworks.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
8692
| web_frameworks.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |

‎rust/ql/test/library-tests/path-resolution/path-resolution.expected‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,13 @@ resolvePath
393393
| proc_macro.rs:5:44:5:54 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
394394
| proc_macro.rs:5:60:5:70 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
395395
| proc_macro.rs:6:16:6:18 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
396+
| proc_macro.rs:6:48:6:50 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
397+
| proc_macro.rs:6:48:6:58 | ...::LitStr | {EXTERNAL LOCATION} | struct LitStr |
398+
| proc_macro.rs:6:48:6:58 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
396399
| proc_macro.rs:7:19:7:21 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
400+
| proc_macro.rs:7:51:7:53 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
401+
| proc_macro.rs:7:51:7:61 | ...::ItemFn | {EXTERNAL LOCATION} | struct ItemFn |
402+
| proc_macro.rs:7:51:7:61 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
397403
| proc_macro.rs:8:21:8:23 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
398404
| proc_macro.rs:8:21:8:30 | ...::Ident | {EXTERNAL LOCATION} | struct Ident |
399405
| proc_macro.rs:8:21:8:35 | ...::new | {EXTERNAL LOCATION} | fn new |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
multipleMethodCallTargets
2+
| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign |
3+
| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign |
4+
| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign |
5+
| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
6+
| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
7+
| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
18
multiplePathResolutions
29
| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
310
| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |

0 commit comments

Comments
 (0)