Skip to content

Commit b59b90b

Browse files
author
Paolo Tranquilli
committed
Rust: accept test changes
1 parent d0804ac commit b59b90b

File tree

13 files changed

+49
-49
lines changed

13 files changed

+49
-49
lines changed

rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
canonicalPaths
22
| anonymous.rs:1:1:1:26 | Use | None | None |
33
| anonymous.rs:3:1:32:1 | fn canonicals | repo::test | crate::anonymous::canonicals |
4-
| anonymous.rs:4:5:4:23 | Struct | repo::test | {0}::OtherStruct |
4+
| anonymous.rs:4:5:4:23 | struct OtherStruct | repo::test | {0}::OtherStruct |
55
| anonymous.rs:6:5:8:5 | trait OtherTrait | repo::test | {0}::OtherTrait |
66
| anonymous.rs:7:9:7:20 | fn g | repo::test | {0}::OtherTrait::g |
77
| anonymous.rs:10:5:12:5 | impl OtherTrait for OtherStruct { ... } | None | None |
@@ -11,13 +11,13 @@ canonicalPaths
1111
| anonymous.rs:18:5:20:5 | impl ...::Trait for OtherStruct { ... } | None | None |
1212
| anonymous.rs:19:9:19:22 | fn f | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
1313
| anonymous.rs:22:5:24:5 | fn nested | repo::test | {0}::nested |
14-
| anonymous.rs:23:9:23:27 | Struct | repo::test | {1}::OtherStruct |
14+
| anonymous.rs:23:9:23:27 | struct OtherStruct | repo::test | {1}::OtherStruct |
1515
| anonymous.rs:26:5:31:5 | fn usage | repo::test | {0}::usage |
1616
| anonymous.rs:34:1:36:1 | fn other | repo::test | crate::anonymous::other |
17-
| anonymous.rs:35:5:35:23 | Struct | repo::test | {36}::OtherStruct |
17+
| anonymous.rs:35:5:35:23 | struct OtherStruct | repo::test | {36}::OtherStruct |
1818
| lib.rs:1:1:1:14 | mod anonymous | repo::test | crate::anonymous |
1919
| lib.rs:2:1:2:12 | mod regular | repo::test | crate::regular |
20-
| regular.rs:1:1:2:18 | Struct | repo::test | crate::regular::Struct |
20+
| regular.rs:1:1:2:18 | struct Struct | repo::test | crate::regular::Struct |
2121
| regular.rs:4:1:6:1 | trait Trait | repo::test | crate::regular::Trait |
2222
| regular.rs:5:5:5:16 | fn f | repo::test | crate::regular::Trait::f |
2323
| regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | None |
@@ -38,17 +38,17 @@ canonicalPaths
3838
resolvedPaths
3939
| anonymous.rs:27:17:27:30 | OtherStruct {...} | repo::test | {0}::OtherStruct |
4040
| anonymous.rs:28:9:28:9 | s | None | None |
41-
| anonymous.rs:28:9:28:13 | ... .f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
41+
| anonymous.rs:28:9:28:13 | s.f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
4242
| anonymous.rs:29:9:29:9 | s | None | None |
43-
| anonymous.rs:29:9:29:13 | ... .g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
43+
| anonymous.rs:29:9:29:13 | s.g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
4444
| anonymous.rs:30:9:30:14 | nested | repo::test | {0}::nested |
4545
| regular.rs:27:13:27:21 | Struct {...} | repo::test | crate::regular::Struct |
4646
| regular.rs:28:5:28:5 | s | None | None |
47-
| regular.rs:28:5:28:9 | ... .f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
47+
| regular.rs:28:5:28:9 | s.f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
4848
| regular.rs:29:5:29:5 | s | None | None |
49-
| regular.rs:29:5:29:9 | ... .g(...) | repo::test | <crate::regular::Struct>::g |
49+
| regular.rs:29:5:29:9 | s.g(...) | repo::test | <crate::regular::Struct>::g |
5050
| regular.rs:30:5:30:5 | s | None | None |
51-
| regular.rs:30:5:30:9 | ... .h(...) | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
51+
| regular.rs:30:5:30:9 | s.h(...) | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
5252
| regular.rs:31:5:31:8 | free | repo::test | crate::regular::free |
5353
| regular.rs:41:9:41:26 | ...::None::<...> | lang:core | crate::option::Option::None |
5454
| regular.rs:42:9:42:20 | ...::Some | lang:core | crate::option::Option::Some |

rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
noLocation
2-
| file://:0:0:0:0 | ... .parent(...) |
32
| file://:0:0:0:0 | ... .unwrap(...) |
43
| file://:0:0:0:0 | ...: ... |
54
| file://:0:0:0:0 | ...::Path |
@@ -35,6 +34,7 @@ noLocation
3534
| file://:0:0:0:0 | path |
3635
| file://:0:0:0:0 | path |
3736
| file://:0:0:0:0 | path |
37+
| file://:0:0:0:0 | path.parent(...) |
3838
| file://:0:0:0:0 | std |
3939
| file://:0:0:0:0 | std |
4040
| file://:0:0:0:0 | std |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
2-
| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
1+
| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
2+
| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
2-
| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
1+
| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
2+
| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
1+
| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
2-
| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
1+
| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
2+
| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| gen_method_call_expr.rs:5:5:5:13 | ... .foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
2-
| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |
1+
| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
2+
| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| utf8_identifiers.rs:4:2:4:3 | ParamList |
1313
| utf8_identifiers.rs:4:5:4:6 | StmtList |
1414
| utf8_identifiers.rs:4:5:4:6 | { ... } |
15-
| utf8_identifiers.rs:6:1:8:1 | Struct |
15+
| utf8_identifiers.rs:6:1:8:1 | struct X |
1616
| utf8_identifiers.rs:6:8:6:8 | X |
1717
| utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
1818
| utf8_identifiers.rs:7:5:7:5 | \u03b4 |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ edges
1919
| test.rs:11:23:11:34 | ...::new | test.rs:11:23:11:36 | ...::new(...) | |
2020
| test.rs:11:23:11:36 | ...::new(...) | test.rs:11:13:11:19 | map | |
2121
| test.rs:12:9:12:11 | map | test.rs:12:20:12:21 | 37 | |
22-
| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | { ... } | |
22+
| test.rs:12:9:12:27 | map.insert(...) | test.rs:10:22:13:5 | { ... } | |
2323
| test.rs:12:9:12:28 | ExprStmt | test.rs:12:9:12:11 | map | |
2424
| test.rs:12:20:12:21 | 37 | test.rs:12:24:12:26 | "a" | |
25-
| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | ... .insert(...) | |
25+
| test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | map.insert(...) | |
2626
| test.rs:18:5:24:5 | enter fn next | test.rs:18:13:18:13 | n | |
2727
| test.rs:18:5:24:5 | exit fn next (normal) | test.rs:18:5:24:5 | exit fn next | |
2828
| test.rs:18:13:18:13 | n | test.rs:18:13:18:18 | ...: i64 | match |
@@ -194,8 +194,8 @@ edges
194194
| test.rs:99:19:99:25 | Some(...) | test.rs:99:9:103:9 | while ... { ... } | no-match |
195195
| test.rs:99:19:99:25 | Some(...) | test.rs:99:24:99:24 | x | match |
196196
| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
197-
| test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | ... .next(...) | |
198-
| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | Some(...) | |
197+
| test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | iter.next(...) | |
198+
| test.rs:99:29:99:39 | iter.next(...) | test.rs:99:19:99:25 | Some(...) | |
199199
| test.rs:99:41:103:9 | { ... } | test.rs:99:15:99:39 | let ... = ... | |
200200
| test.rs:100:13:102:13 | if ... {...} | test.rs:99:41:103:9 | { ... } | |
201201
| test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 | |
@@ -631,8 +631,8 @@ edges
631631
| test.rs:292:87:294:5 | { ... } | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) | |
632632
| test.rs:293:9:293:10 | Ok | test.rs:293:12:293:12 | s | |
633633
| test.rs:293:9:293:33 | Ok(...) | test.rs:292:87:294:5 | { ... } | |
634-
| test.rs:293:12:293:12 | s | test.rs:293:12:293:27 | ... .parse(...) | |
635-
| test.rs:293:12:293:27 | ... .parse(...) | test.rs:293:12:293:28 | TryExpr | |
634+
| test.rs:293:12:293:12 | s | test.rs:293:12:293:27 | s.parse(...) | |
635+
| test.rs:293:12:293:27 | s.parse(...) | test.rs:293:12:293:28 | TryExpr | |
636636
| test.rs:293:12:293:28 | TryExpr | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) | return |
637637
| test.rs:293:12:293:28 | TryExpr | test.rs:293:32:293:32 | 4 | match |
638638
| test.rs:293:12:293:32 | ... + ... | test.rs:293:9:293:33 | Ok(...) | |

rust/ql/test/library-tests/dataflow/global/inline-flow.expected

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ edges
1616
| main.rs:41:26:44:5 | { ... } | main.rs:41:13:44:6 | pass_through(...) | provenance | |
1717
| main.rs:43:9:43:18 | source(...) | main.rs:41:26:44:5 | { ... } | provenance | |
1818
| main.rs:56:23:56:28 | ...: i64 | main.rs:57:14:57:14 | n | provenance | |
19-
| main.rs:59:31:65:5 | { ... } | main.rs:77:13:77:25 | ... .get_data(...) | provenance | |
19+
| main.rs:59:31:65:5 | { ... } | main.rs:77:13:77:25 | mn.get_data(...) | provenance | |
2020
| main.rs:63:13:63:21 | source(...) | main.rs:59:31:65:5 | { ... } | provenance | |
2121
| main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | provenance | |
22-
| main.rs:77:13:77:25 | ... .get_data(...) | main.rs:78:10:78:10 | a | provenance | |
22+
| main.rs:77:13:77:25 | mn.get_data(...) | main.rs:78:10:78:10 | a | provenance | |
2323
| main.rs:83:13:83:21 | source(...) | main.rs:84:16:84:16 | a | provenance | |
2424
| main.rs:84:16:84:16 | a | main.rs:56:23:56:28 | ...: i64 | provenance | |
2525
| main.rs:89:13:89:21 | source(...) | main.rs:90:29:90:29 | a | provenance | |
26-
| main.rs:90:13:90:30 | ... .data_through(...) | main.rs:91:10:91:10 | b | provenance | |
26+
| main.rs:90:13:90:30 | mn.data_through(...) | main.rs:91:10:91:10 | b | provenance | |
2727
| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | provenance | |
28-
| main.rs:90:29:90:29 | a | main.rs:90:13:90:30 | ... .data_through(...) | provenance | |
28+
| main.rs:90:29:90:29 | a | main.rs:90:13:90:30 | mn.data_through(...) | provenance | |
2929
nodes
3030
| main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
3131
| main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
@@ -51,18 +51,18 @@ nodes
5151
| main.rs:63:13:63:21 | source(...) | semmle.label | source(...) |
5252
| main.rs:66:28:66:33 | ...: i64 | semmle.label | ...: i64 |
5353
| main.rs:66:43:72:5 | { ... } | semmle.label | { ... } |
54-
| main.rs:77:13:77:25 | ... .get_data(...) | semmle.label | ... .get_data(...) |
54+
| main.rs:77:13:77:25 | mn.get_data(...) | semmle.label | mn.get_data(...) |
5555
| main.rs:78:10:78:10 | a | semmle.label | a |
5656
| main.rs:83:13:83:21 | source(...) | semmle.label | source(...) |
5757
| main.rs:84:16:84:16 | a | semmle.label | a |
5858
| main.rs:89:13:89:21 | source(...) | semmle.label | source(...) |
59-
| main.rs:90:13:90:30 | ... .data_through(...) | semmle.label | ... .data_through(...) |
59+
| main.rs:90:13:90:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
6060
| main.rs:90:29:90:29 | a | semmle.label | a |
6161
| main.rs:91:10:91:10 | b | semmle.label | b |
6262
subpaths
6363
| main.rs:36:26:36:26 | a | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:36:13:36:27 | pass_through(...) |
6464
| main.rs:41:26:44:5 | { ... } | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:41:13:44:6 | pass_through(...) |
65-
| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | main.rs:90:13:90:30 | ... .data_through(...) |
65+
| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | main.rs:90:13:90:30 | mn.data_through(...) |
6666
testFailures
6767
#select
6868
| main.rs:18:10:18:10 | a | main.rs:13:5:13:13 | source(...) | main.rs:18:10:18:10 | a | $@ | main.rs:13:5:13:13 | source(...) | source(...) |

0 commit comments

Comments
 (0)