Rust: accept all test changes for now

Author: Paolo Tranquilli

rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected

@@ -1,2 +1,2 @@
-| gen_box_pat.rs:6:9:6:27 | box ... | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
+| gen_box_pat.rs:6:9:6:27 | box ... | gen_box_pat.rs:6:13:6:27 | ...::Some(...) |
 | gen_box_pat.rs:7:9:7:24 | box ...::None | gen_box_pat.rs:7:13:7:24 | ...::None |

rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected

@@ -1 +1 @@
-| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | ...::Some(...) |

rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected

@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:12:5:18 | TupleStructPat |
+| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:12:5:18 | Some(...) |

rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected

@@ -3,4 +3,4 @@
 | gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:9:7:9 | x |
 | gen_let_stmt.rs:8:5:8:10 | let ... | gen_let_stmt.rs:8:9:8:9 | x |
 | gen_let_stmt.rs:9:5:9:24 | let ... = ... | gen_let_stmt.rs:9:9:9:14 | TuplePat |
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:9:10:15 | Some(...) |

rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected

@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:9:6:23 | TupleStructPat |
+| gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:9:6:23 | ...::Some(...) |
 | gen_match_arm.rs:7:9:7:26 | ...::None => 0 | gen_match_arm.rs:7:9:7:20 | ...::None |
-| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:9:10:15 | TupleStructPat |
+| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:9:10:15 | Some(...) |
 | gen_match_arm.rs:11:9:11:15 | _ => 0 | gen_match_arm.rs:11:9:11:9 | _ |

rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected

@@ -1,2 +1,2 @@
-| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 0 | gen_or_pat.rs:6:9:6:23 | TupleStructPat |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 0 | gen_or_pat.rs:6:9:6:23 | ...::Some(...) |
 | gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 1 | gen_or_pat.rs:6:27:6:38 | ...::None |

rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected

@@ -1,2 +1,2 @@
-| gen_ref_pat.rs:6:9:6:28 | &mut ... | gen_ref_pat.rs:6:14:6:28 | TupleStructPat |
+| gen_ref_pat.rs:6:9:6:28 | &mut ... | gen_ref_pat.rs:6:14:6:28 | ...::Some(...) |
 | gen_ref_pat.rs:7:9:7:21 | &...::None | gen_ref_pat.rs:7:10:7:21 | ...::None |

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

@@ -14,10 +14,10 @@ edges
 | test.rs:6:12:6:31 | [boolean(false)] ... && ... | test.rs:9:13:9:17 | false | false |
 | test.rs:6:12:6:31 | [boolean(true)] ... && ... | test.rs:7:13:7:13 | d | true |
 | test.rs:6:17:6:31 | let ... = b | test.rs:6:31:6:31 | b |  |
-| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
-| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:26:6:26 | d | match |
+| test.rs:6:21:6:27 | Some(...) | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
+| test.rs:6:21:6:27 | Some(...) | test.rs:6:26:6:26 | d | match |
 | test.rs:6:26:6:26 | d | test.rs:6:12:6:31 | [boolean(true)] ... && ... | match |
-| test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | TupleStructPat |  |
+| test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | Some(...) |  |
 | test.rs:6:33:8:9 | { ... } | test.rs:6:9:10:9 | if ... {...} else {...} |  |
 | test.rs:7:13:7:13 | d | test.rs:6:33:8:9 | { ... } |  |
 | test.rs:8:16:10:9 | { ... } | test.rs:6:9:10:9 | if ... {...} else {...} |  |

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

@@ -191,11 +191,11 @@ edges
 | test.rs:98:27:98:28 | 10 | test.rs:98:24:98:28 | 1..10 |  |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:97:25:104:5 | { ... } |  |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:99:29:99:32 | iter |  |
-| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:9:103:9 | while ... { ... } | no-match |
-| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:24:99:24 | x | match |
+| test.rs:99:19:99:25 | Some(...) | test.rs:99:9:103:9 | while ... { ... } | no-match |
+| test.rs:99:19:99:25 | Some(...) | test.rs:99:24:99:24 | x | match |
 | test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
 | test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | ... .next(...) |  |
-| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | TupleStructPat |  |
+| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | Some(...) |  |
 | test.rs:99:41:103:9 | { ... } | test.rs:99:15:99:39 | let ... = ... |  |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:99:41:103:9 | { ... } |  |
 | test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 |  |
@@ -274,10 +274,10 @@ edges
 | test.rs:137:48:143:5 | { ... } | test.rs:137:5:143:5 | exit fn test_if_let_else (normal) |  |
 | test.rs:138:9:142:9 | if ... {...} else {...} | test.rs:137:48:143:5 | { ... } |  |
 | test.rs:138:12:138:26 | let ... = a | test.rs:138:26:138:26 | a |  |
-| test.rs:138:16:138:22 | TupleStructPat | test.rs:138:21:138:21 | n | match |
-| test.rs:138:16:138:22 | TupleStructPat | test.rs:141:13:141:13 | 0 | no-match |
+| test.rs:138:16:138:22 | Some(...) | test.rs:138:21:138:21 | n | match |
+| test.rs:138:16:138:22 | Some(...) | test.rs:141:13:141:13 | 0 | no-match |
 | test.rs:138:21:138:21 | n | test.rs:139:13:139:13 | n | match |
-| test.rs:138:26:138:26 | a | test.rs:138:16:138:22 | TupleStructPat |  |
+| test.rs:138:26:138:26 | a | test.rs:138:16:138:22 | Some(...) |  |
 | test.rs:138:28:140:9 | { ... } | test.rs:138:9:142:9 | if ... {...} else {...} |  |
 | test.rs:139:13:139:13 | n | test.rs:138:28:140:9 | { ... } |  |
 | test.rs:140:16:142:9 | { ... } | test.rs:138:9:142:9 | if ... {...} else {...} |  |
@@ -290,10 +290,10 @@ edges
 | test.rs:146:9:148:9 | ExprStmt | test.rs:146:12:146:26 | let ... = a |  |
 | test.rs:146:9:148:9 | if ... {...} | test.rs:149:9:149:9 | 0 |  |
 | test.rs:146:12:146:26 | let ... = a | test.rs:146:26:146:26 | a |  |
-| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:9:148:9 | if ... {...} | no-match |
-| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:21:146:21 | n | match |
+| test.rs:146:16:146:22 | Some(...) | test.rs:146:9:148:9 | if ... {...} | no-match |
+| test.rs:146:16:146:22 | Some(...) | test.rs:146:21:146:21 | n | match |
 | test.rs:146:21:146:21 | n | test.rs:147:13:147:21 | ExprStmt | match |
-| test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | TupleStructPat |  |
+| test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | Some(...) |  |
 | test.rs:147:13:147:20 | return n | test.rs:145:5:150:5 | exit fn test_if_let (normal) | return |
 | test.rs:147:13:147:21 | ExprStmt | test.rs:147:20:147:20 | n |  |
 | test.rs:147:20:147:20 | n | test.rs:147:13:147:20 | return n |  |
@@ -663,19 +663,19 @@ edges
 | test.rs:307:19:307:42 | ...: Option::<...> | test.rs:308:15:308:25 | maybe_digit |  |
 | test.rs:307:52:313:5 | { ... } | test.rs:307:5:313:5 | exit fn test_match (normal) |  |
 | test.rs:308:9:312:9 | match maybe_digit { ... } | test.rs:307:52:313:5 | { ... } |  |
-| test.rs:308:15:308:25 | maybe_digit | test.rs:309:13:309:27 | TupleStructPat |  |
-| test.rs:309:13:309:27 | TupleStructPat | test.rs:309:26:309:26 | x | match |
-| test.rs:309:13:309:27 | TupleStructPat | test.rs:310:13:310:27 | TupleStructPat | no-match |
+| test.rs:308:15:308:25 | maybe_digit | test.rs:309:13:309:27 | ...::Some(...) |  |
+| test.rs:309:13:309:27 | ...::Some(...) | test.rs:309:26:309:26 | x | match |
+| test.rs:309:13:309:27 | ...::Some(...) | test.rs:310:13:310:27 | ...::Some(...) | no-match |
 | test.rs:309:26:309:26 | x | test.rs:309:32:309:32 | x | match |
 | test.rs:309:32:309:32 | x | test.rs:309:36:309:37 | 10 |  |
 | test.rs:309:32:309:37 | ... < ... | test.rs:309:42:309:42 | x | true |
-| test.rs:309:32:309:37 | ... < ... | test.rs:310:13:310:27 | TupleStructPat | false |
+| test.rs:309:32:309:37 | ... < ... | test.rs:310:13:310:27 | ...::Some(...) | false |
 | test.rs:309:36:309:37 | 10 | test.rs:309:32:309:37 | ... < ... |  |
 | test.rs:309:42:309:42 | x | test.rs:309:46:309:46 | 5 |  |
 | test.rs:309:42:309:46 | ... + ... | test.rs:308:9:312:9 | match maybe_digit { ... } |  |
 | test.rs:309:46:309:46 | 5 | test.rs:309:42:309:46 | ... + ... |  |
-| test.rs:310:13:310:27 | TupleStructPat | test.rs:310:26:310:26 | x | match |
-| test.rs:310:13:310:27 | TupleStructPat | test.rs:311:13:311:24 | ...::None | no-match |
+| test.rs:310:13:310:27 | ...::Some(...) | test.rs:310:26:310:26 | x | match |
+| test.rs:310:13:310:27 | ...::Some(...) | test.rs:311:13:311:24 | ...::None | no-match |
 | test.rs:310:26:310:26 | x | test.rs:310:32:310:32 | x | match |
 | test.rs:310:32:310:32 | x | test.rs:308:9:312:9 | match maybe_digit { ... } |  |
 | test.rs:311:13:311:24 | ...::None | test.rs:311:29:311:29 | 5 | match |
@@ -686,7 +686,7 @@ edges
 | test.rs:315:44:315:67 | ...: Option::<...> | test.rs:316:19:316:29 | maybe_digit |  |
 | test.rs:315:77:324:5 | { ... } | test.rs:315:5:324:5 | exit fn test_match_with_return_in_scrutinee (normal) |  |
 | test.rs:316:9:323:9 | match ... { ... } | test.rs:315:77:324:5 | { ... } |  |
-| test.rs:316:16:320:9 | if ... {...} else {...} | test.rs:321:13:321:27 | TupleStructPat |  |
+| test.rs:316:16:320:9 | if ... {...} else {...} | test.rs:321:13:321:27 | ...::Some(...) |  |
 | test.rs:316:19:316:29 | maybe_digit | test.rs:316:34:316:37 | Some |  |
 | test.rs:316:19:316:40 | ... == ... | test.rs:317:13:317:21 | ExprStmt | true |
 | test.rs:316:19:316:40 | ... == ... | test.rs:319:13:319:23 | maybe_digit | false |
@@ -698,8 +698,8 @@ edges
 | test.rs:317:20:317:20 | 3 | test.rs:317:13:317:20 | return 3 |  |
 | test.rs:318:16:320:9 | { ... } | test.rs:316:16:320:9 | if ... {...} else {...} |  |
 | test.rs:319:13:319:23 | maybe_digit | test.rs:318:16:320:9 | { ... } |  |
-| test.rs:321:13:321:27 | TupleStructPat | test.rs:321:26:321:26 | x | match |
-| test.rs:321:13:321:27 | TupleStructPat | test.rs:322:13:322:24 | ...::None | no-match |
+| test.rs:321:13:321:27 | ...::Some(...) | test.rs:321:26:321:26 | x | match |
+| test.rs:321:13:321:27 | ...::Some(...) | test.rs:322:13:322:24 | ...::None | no-match |
 | test.rs:321:26:321:26 | x | test.rs:321:32:321:32 | x | match |
 | test.rs:321:32:321:32 | x | test.rs:321:36:321:36 | 5 |  |
 | test.rs:321:32:321:36 | ... + ... | test.rs:316:9:323:9 | match ... { ... } |  |
@@ -716,9 +716,9 @@ edges
 | test.rs:327:9:330:18 | ... && ... | test.rs:326:60:331:5 | { ... } |  |
 | test.rs:327:10:330:9 | [boolean(false)] match r { ... } | test.rs:327:9:330:18 | ... && ... | false |
 | test.rs:327:10:330:9 | [boolean(true)] match r { ... } | test.rs:330:15:330:18 | cond | true |
-| test.rs:327:16:327:16 | r | test.rs:328:13:328:19 | TupleStructPat |  |
-| test.rs:328:13:328:19 | TupleStructPat | test.rs:328:18:328:18 | a | match |
-| test.rs:328:13:328:19 | TupleStructPat | test.rs:329:13:329:13 | _ | no-match |
+| test.rs:327:16:327:16 | r | test.rs:328:13:328:19 | Some(...) |  |
+| test.rs:328:13:328:19 | Some(...) | test.rs:328:18:328:18 | a | match |
+| test.rs:328:13:328:19 | Some(...) | test.rs:329:13:329:13 | _ | no-match |
 | test.rs:328:18:328:18 | a | test.rs:328:24:328:24 | a | match |
 | test.rs:328:24:328:24 | a | test.rs:327:10:330:9 | [boolean(false)] match r { ... } | false |
 | test.rs:328:24:328:24 | a | test.rs:327:10:330:9 | [boolean(true)] match r { ... } | true |
@@ -731,12 +731,12 @@ edges
 | test.rs:333:35:333:58 | ...: Result::<...> | test.rs:334:15:334:15 | r |  |
 | test.rs:333:66:338:5 | { ... } | test.rs:333:5:338:5 | exit fn test_match_with_no_arms (normal) |  |
 | test.rs:334:9:337:9 | match r { ... } | test.rs:333:66:338:5 | { ... } |  |
-| test.rs:334:15:334:15 | r | test.rs:335:13:335:21 | TupleStructPat |  |
-| test.rs:335:13:335:21 | TupleStructPat | test.rs:335:16:335:20 | value | match |
-| test.rs:335:13:335:21 | TupleStructPat | test.rs:336:13:336:22 | TupleStructPat | no-match |
+| test.rs:334:15:334:15 | r | test.rs:335:13:335:21 | Ok(...) |  |
+| test.rs:335:13:335:21 | Ok(...) | test.rs:335:16:335:20 | value | match |
+| test.rs:335:13:335:21 | Ok(...) | test.rs:336:13:336:22 | Err(...) | no-match |
 | test.rs:335:16:335:20 | value | test.rs:335:26:335:30 | value | match |
 | test.rs:335:26:335:30 | value | test.rs:334:9:337:9 | match r { ... } |  |
-| test.rs:336:13:336:22 | TupleStructPat | test.rs:336:17:336:21 | never | match |
+| test.rs:336:13:336:22 | Err(...) | test.rs:336:17:336:21 | never | match |
 | test.rs:336:17:336:21 | never | test.rs:336:33:336:37 | never | match |
 | test.rs:336:27:336:40 | match never { ... } | test.rs:334:9:337:9 | match r { ... } |  |
 | test.rs:336:33:336:37 | never | test.rs:336:27:336:40 | match never { ... } |  |
@@ -746,10 +746,10 @@ edges
 | test.rs:343:23:343:36 | ...: Option::<...> | test.rs:344:9:344:57 | let ... = a else {...} |  |
 | test.rs:343:46:346:5 | { ... } | test.rs:343:5:346:5 | exit fn test_let_match (normal) |  |
 | test.rs:344:9:344:57 | let ... = a else {...} | test.rs:344:23:344:23 | a |  |
-| test.rs:344:13:344:19 | TupleStructPat | test.rs:344:18:344:18 | n | match |
-| test.rs:344:13:344:19 | TupleStructPat | test.rs:344:39:344:53 | MacroStmts | no-match |
+| test.rs:344:13:344:19 | Some(...) | test.rs:344:18:344:18 | n | match |
+| test.rs:344:13:344:19 | Some(...) | test.rs:344:39:344:53 | MacroStmts | no-match |
 | test.rs:344:18:344:18 | n | test.rs:345:9:345:9 | n | match |
-| test.rs:344:23:344:23 | a | test.rs:344:13:344:19 | TupleStructPat |  |
+| test.rs:344:23:344:23 | a | test.rs:344:13:344:19 | Some(...) |  |
 | test.rs:344:32:344:54 | ...::panic_fmt | test.rs:344:39:344:53 | "Expected some" |  |
 | test.rs:344:32:344:54 | MacroExpr | test.rs:344:30:344:56 | { ... } |  |
 | test.rs:344:39:344:53 | "Expected some" | test.rs:344:39:344:53 | FormatArgsExpr |  |
@@ -770,9 +770,9 @@ edges
 | test.rs:349:9:352:10 | let ... = ... | test.rs:349:25:349:25 | m |  |
 | test.rs:349:13:349:15 | ret | test.rs:353:9:353:12 | true | match |
 | test.rs:349:19:352:9 | match m { ... } | test.rs:349:13:349:15 | ret |  |
-| test.rs:349:25:349:25 | m | test.rs:350:13:350:21 | TupleStructPat |  |
-| test.rs:350:13:350:21 | TupleStructPat | test.rs:350:18:350:20 | ret | match |
-| test.rs:350:13:350:21 | TupleStructPat | test.rs:351:13:351:16 | None | no-match |
+| test.rs:349:25:349:25 | m | test.rs:350:13:350:21 | Some(...) |  |
+| test.rs:350:13:350:21 | Some(...) | test.rs:350:18:350:20 | ret | match |
+| test.rs:350:13:350:21 | Some(...) | test.rs:351:13:351:16 | None | no-match |
 | test.rs:350:18:350:20 | ret | test.rs:350:26:350:28 | ret | match |
 | test.rs:350:26:350:28 | ret | test.rs:349:19:352:9 | match m { ... } |  |
 | test.rs:351:13:351:16 | None | test.rs:351:28:351:32 | false | match |
@@ -1030,10 +1030,10 @@ edges
 | test.rs:484:13:484:13 | x | test.rs:485:9:487:10 | let ... = x else {...} | match |
 | test.rs:484:30:484:33 | None | test.rs:484:13:484:13 | x |  |
 | test.rs:485:9:487:10 | let ... = x else {...} | test.rs:485:23:485:23 | x |  |
-| test.rs:485:13:485:19 | TupleStructPat | test.rs:485:18:485:18 | y | match |
-| test.rs:485:13:485:19 | TupleStructPat | test.rs:486:13:486:27 | ExprStmt | no-match |
+| test.rs:485:13:485:19 | Some(...) | test.rs:485:18:485:18 | y | match |
+| test.rs:485:13:485:19 | Some(...) | test.rs:486:13:486:27 | ExprStmt | no-match |
 | test.rs:485:18:485:18 | y | test.rs:488:9:488:9 | 0 | match |
-| test.rs:485:23:485:23 | x | test.rs:485:13:485:19 | TupleStructPat |  |
+| test.rs:485:23:485:23 | x | test.rs:485:13:485:19 | Some(...) |  |
 | test.rs:486:13:486:26 | break ''block 1 | test.rs:483:18:489:5 | 'block: { ... } | break |
 | test.rs:486:13:486:27 | ExprStmt | test.rs:486:26:486:26 | 1 |  |
 | test.rs:486:26:486:26 | 1 | test.rs:486:13:486:26 | break ''block 1 |  |