Skip to content

Commit 643059e

Browse files
aibaarshvitved
aibaars
authored and
hvitved
committed
Rust: fix type-interence file paths
1 parent 44a4045 commit 643059e

File tree

2 files changed

+35
-37
lines changed

2 files changed

+35
-37
lines changed

‎rust/ql/test/library-tests/type-inference/type-inference.expected

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -494,12 +494,10 @@ inferType
494494
| main.rs:377:26:377:29 | SelfParam | | main.rs:366:5:367:14 | S1 |
495495
| main.rs:377:38:379:9 | { ... } | | main.rs:366:5:367:14 | S1 |
496496
| main.rs:378:20:378:31 | "not called" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
497-
| main.rs:378:20:378:31 | MacroExpr | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/fmt/mod.rs:549:1:584:1 | Arguments |
498497
| main.rs:382:28:382:31 | SelfParam | | main.rs:366:5:367:14 | S1 |
499498
| main.rs:382:34:382:35 | s1 | | main.rs:366:5:367:14 | S1 |
500499
| main.rs:382:48:384:9 | { ... } | | main.rs:366:5:367:14 | S1 |
501500
| main.rs:383:20:383:31 | "not called" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
502-
| main.rs:383:20:383:31 | MacroExpr | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/fmt/mod.rs:549:1:584:1 | Arguments |
503501
| main.rs:389:26:389:29 | SelfParam | | main.rs:366:5:367:14 | S1 |
504502
| main.rs:389:38:391:9 | { ... } | | main.rs:366:5:367:14 | S1 |
505503
| main.rs:390:13:390:16 | self | | main.rs:366:5:367:14 | S1 |
@@ -1004,10 +1002,8 @@ inferType
10041002
| main.rs:884:19:884:22 | self | Snd | main.rs:882:15:882:17 | Snd |
10051003
| main.rs:885:43:885:82 | MacroExpr | | main.rs:882:15:882:17 | Snd |
10061004
| main.rs:885:50:885:81 | "PairNone has no second elemen... | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1007-
| main.rs:885:50:885:81 | MacroExpr | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/fmt/mod.rs:549:1:584:1 | Arguments |
10081005
| main.rs:886:43:886:81 | MacroExpr | | main.rs:882:15:882:17 | Snd |
10091006
| main.rs:886:50:886:80 | "PairFst has no second element... | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1010-
| main.rs:886:50:886:80 | MacroExpr | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/fmt/mod.rs:549:1:584:1 | Arguments |
10111007
| main.rs:887:37:887:39 | snd | | main.rs:882:15:882:17 | Snd |
10121008
| main.rs:887:45:887:47 | snd | | main.rs:882:15:882:17 | Snd |
10131009
| main.rs:888:41:888:43 | snd | | main.rs:882:15:882:17 | Snd |
@@ -1472,96 +1468,96 @@ inferType
14721468
| main.rs:1150:15:1150:16 | &x | | file://:0:0:0:0 | & |
14731469
| main.rs:1150:15:1150:16 | &x | &T | main.rs:1126:5:1126:13 | S |
14741470
| main.rs:1150:16:1150:16 | x | | main.rs:1126:5:1126:13 | S |
1475-
| main.rs:1164:43:1167:5 | { ... } | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1471+
| main.rs:1164:43:1167:5 | { ... } | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14761472
| main.rs:1164:43:1167:5 | { ... } | E | main.rs:1157:5:1158:14 | S1 |
14771473
| main.rs:1164:43:1167:5 | { ... } | T | main.rs:1157:5:1158:14 | S1 |
14781474
| main.rs:1165:13:1165:13 | x | | main.rs:1157:5:1158:14 | S1 |
1479-
| main.rs:1165:17:1165:30 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1475+
| main.rs:1165:17:1165:30 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14801476
| main.rs:1165:17:1165:30 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
14811477
| main.rs:1165:17:1165:31 | TryExpr | | main.rs:1157:5:1158:14 | S1 |
14821478
| main.rs:1165:28:1165:29 | S1 | | main.rs:1157:5:1158:14 | S1 |
1483-
| main.rs:1166:9:1166:22 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1479+
| main.rs:1166:9:1166:22 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14841480
| main.rs:1166:9:1166:22 | ...::Ok(...) | E | main.rs:1157:5:1158:14 | S1 |
14851481
| main.rs:1166:9:1166:22 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
14861482
| main.rs:1166:20:1166:21 | S1 | | main.rs:1157:5:1158:14 | S1 |
1487-
| main.rs:1170:46:1174:5 | { ... } | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1483+
| main.rs:1170:46:1174:5 | { ... } | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14881484
| main.rs:1170:46:1174:5 | { ... } | E | main.rs:1160:5:1161:14 | S2 |
14891485
| main.rs:1170:46:1174:5 | { ... } | T | main.rs:1157:5:1158:14 | S1 |
1490-
| main.rs:1171:13:1171:13 | x | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1486+
| main.rs:1171:13:1171:13 | x | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14911487
| main.rs:1171:13:1171:13 | x | T | main.rs:1157:5:1158:14 | S1 |
1492-
| main.rs:1171:17:1171:30 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1488+
| main.rs:1171:17:1171:30 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14931489
| main.rs:1171:17:1171:30 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
14941490
| main.rs:1171:28:1171:29 | S1 | | main.rs:1157:5:1158:14 | S1 |
14951491
| main.rs:1172:13:1172:13 | y | | main.rs:1157:5:1158:14 | S1 |
1496-
| main.rs:1172:17:1172:17 | x | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1492+
| main.rs:1172:17:1172:17 | x | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
14971493
| main.rs:1172:17:1172:17 | x | T | main.rs:1157:5:1158:14 | S1 |
14981494
| main.rs:1172:17:1172:18 | TryExpr | | main.rs:1157:5:1158:14 | S1 |
1499-
| main.rs:1173:9:1173:22 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1495+
| main.rs:1173:9:1173:22 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15001496
| main.rs:1173:9:1173:22 | ...::Ok(...) | E | main.rs:1160:5:1161:14 | S2 |
15011497
| main.rs:1173:9:1173:22 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
15021498
| main.rs:1173:20:1173:21 | S1 | | main.rs:1157:5:1158:14 | S1 |
1503-
| main.rs:1177:40:1182:5 | { ... } | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1499+
| main.rs:1177:40:1182:5 | { ... } | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15041500
| main.rs:1177:40:1182:5 | { ... } | E | main.rs:1160:5:1161:14 | S2 |
15051501
| main.rs:1177:40:1182:5 | { ... } | T | main.rs:1157:5:1158:14 | S1 |
1506-
| main.rs:1178:13:1178:13 | x | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1507-
| main.rs:1178:13:1178:13 | x | T | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1502+
| main.rs:1178:13:1178:13 | x | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1503+
| main.rs:1178:13:1178:13 | x | T | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15081504
| main.rs:1178:13:1178:13 | x | T.T | main.rs:1157:5:1158:14 | S1 |
1509-
| main.rs:1178:17:1178:42 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1510-
| main.rs:1178:17:1178:42 | ...::Ok(...) | T | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1505+
| main.rs:1178:17:1178:42 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1506+
| main.rs:1178:17:1178:42 | ...::Ok(...) | T | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15111507
| main.rs:1178:17:1178:42 | ...::Ok(...) | T.T | main.rs:1157:5:1158:14 | S1 |
1512-
| main.rs:1178:28:1178:41 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1508+
| main.rs:1178:28:1178:41 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15131509
| main.rs:1178:28:1178:41 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
15141510
| main.rs:1178:39:1178:40 | S1 | | main.rs:1157:5:1158:14 | S1 |
1515-
| main.rs:1180:17:1180:17 | x | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1516-
| main.rs:1180:17:1180:17 | x | T | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1511+
| main.rs:1180:17:1180:17 | x | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1512+
| main.rs:1180:17:1180:17 | x | T | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15171513
| main.rs:1180:17:1180:17 | x | T.T | main.rs:1157:5:1158:14 | S1 |
1518-
| main.rs:1180:17:1180:18 | TryExpr | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1514+
| main.rs:1180:17:1180:18 | TryExpr | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15191515
| main.rs:1180:17:1180:18 | TryExpr | T | main.rs:1157:5:1158:14 | S1 |
1520-
| main.rs:1180:17:1180:29 | ... .map(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1521-
| main.rs:1181:9:1181:22 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1516+
| main.rs:1180:17:1180:29 | ... .map(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1517+
| main.rs:1181:9:1181:22 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15221518
| main.rs:1181:9:1181:22 | ...::Ok(...) | E | main.rs:1160:5:1161:14 | S2 |
15231519
| main.rs:1181:9:1181:22 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
15241520
| main.rs:1181:20:1181:21 | S1 | | main.rs:1157:5:1158:14 | S1 |
1525-
| main.rs:1185:30:1185:34 | input | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1521+
| main.rs:1185:30:1185:34 | input | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15261522
| main.rs:1185:30:1185:34 | input | E | main.rs:1157:5:1158:14 | S1 |
15271523
| main.rs:1185:30:1185:34 | input | T | main.rs:1185:20:1185:27 | T |
1528-
| main.rs:1185:69:1192:5 | { ... } | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1524+
| main.rs:1185:69:1192:5 | { ... } | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15291525
| main.rs:1185:69:1192:5 | { ... } | E | main.rs:1157:5:1158:14 | S1 |
15301526
| main.rs:1185:69:1192:5 | { ... } | T | main.rs:1185:20:1185:27 | T |
15311527
| main.rs:1186:13:1186:17 | value | | main.rs:1185:20:1185:27 | T |
1532-
| main.rs:1186:21:1186:25 | input | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1528+
| main.rs:1186:21:1186:25 | input | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15331529
| main.rs:1186:21:1186:25 | input | E | main.rs:1157:5:1158:14 | S1 |
15341530
| main.rs:1186:21:1186:25 | input | T | main.rs:1185:20:1185:27 | T |
15351531
| main.rs:1186:21:1186:26 | TryExpr | | main.rs:1185:20:1185:27 | T |
1536-
| main.rs:1187:22:1187:38 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1532+
| main.rs:1187:22:1187:38 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15371533
| main.rs:1187:22:1187:38 | ...::Ok(...) | T | main.rs:1185:20:1185:27 | T |
1538-
| main.rs:1187:22:1190:10 | ... .and_then(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1534+
| main.rs:1187:22:1190:10 | ... .and_then(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15391535
| main.rs:1187:33:1187:37 | value | | main.rs:1185:20:1185:27 | T |
1540-
| main.rs:1187:53:1190:9 | { ... } | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1536+
| main.rs:1187:53:1190:9 | { ... } | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15411537
| main.rs:1187:53:1190:9 | { ... } | E | main.rs:1157:5:1158:14 | S1 |
15421538
| main.rs:1188:22:1188:27 | "{:?}\\n" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1543-
| main.rs:1189:13:1189:34 | ...::Ok::<...>(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1539+
| main.rs:1189:13:1189:34 | ...::Ok::<...>(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15441540
| main.rs:1189:13:1189:34 | ...::Ok::<...>(...) | E | main.rs:1157:5:1158:14 | S1 |
1545-
| main.rs:1191:9:1191:23 | ...::Err(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1541+
| main.rs:1191:9:1191:23 | ...::Err(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15461542
| main.rs:1191:9:1191:23 | ...::Err(...) | E | main.rs:1157:5:1158:14 | S1 |
15471543
| main.rs:1191:9:1191:23 | ...::Err(...) | T | main.rs:1185:20:1185:27 | T |
15481544
| main.rs:1191:21:1191:22 | S1 | | main.rs:1157:5:1158:14 | S1 |
1549-
| main.rs:1195:37:1195:52 | try_same_error(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1545+
| main.rs:1195:37:1195:52 | try_same_error(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15501546
| main.rs:1195:37:1195:52 | try_same_error(...) | E | main.rs:1157:5:1158:14 | S1 |
15511547
| main.rs:1195:37:1195:52 | try_same_error(...) | T | main.rs:1157:5:1158:14 | S1 |
15521548
| main.rs:1196:22:1196:27 | "{:?}\\n" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1553-
| main.rs:1199:37:1199:55 | try_convert_error(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1549+
| main.rs:1199:37:1199:55 | try_convert_error(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15541550
| main.rs:1199:37:1199:55 | try_convert_error(...) | E | main.rs:1160:5:1161:14 | S2 |
15551551
| main.rs:1199:37:1199:55 | try_convert_error(...) | T | main.rs:1157:5:1158:14 | S1 |
15561552
| main.rs:1200:22:1200:27 | "{:?}\\n" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1557-
| main.rs:1203:37:1203:49 | try_chained(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1553+
| main.rs:1203:37:1203:49 | try_chained(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15581554
| main.rs:1203:37:1203:49 | try_chained(...) | E | main.rs:1160:5:1161:14 | S2 |
15591555
| main.rs:1203:37:1203:49 | try_chained(...) | T | main.rs:1157:5:1158:14 | S1 |
15601556
| main.rs:1204:22:1204:27 | "{:?}\\n" | | file:///BUILTINS/types.rs:8:1:8:15 | str |
1561-
| main.rs:1207:37:1207:63 | try_complex(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1557+
| main.rs:1207:37:1207:63 | try_complex(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15621558
| main.rs:1207:37:1207:63 | try_complex(...) | E | main.rs:1157:5:1158:14 | S1 |
15631559
| main.rs:1207:37:1207:63 | try_complex(...) | T | main.rs:1157:5:1158:14 | S1 |
1564-
| main.rs:1207:49:1207:62 | ...::Ok(...) | | file:///Users/hvitved/.rustup/toolchains/1.85-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
1560+
| main.rs:1207:49:1207:62 | ...::Ok(...) | | file:///RUSTUP_HOME/toolchain/lib/rustlib/src/rust/library/core/src/result.rs:520:1:538:1 | Result |
15651561
| main.rs:1207:49:1207:62 | ...::Ok(...) | E | main.rs:1157:5:1158:14 | S1 |
15661562
| main.rs:1207:49:1207:62 | ...::Ok(...) | T | main.rs:1157:5:1158:14 | S1 |
15671563
| main.rs:1207:60:1207:61 | S1 | | main.rs:1157:5:1158:14 | S1 |

‎rust/ql/test/library-tests/type-inference/type-inference.ql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class TypeLoc extends TypeFinal {
1111
) {
1212
exists(string file |
1313
this.getLocation().hasLocationInfo(file, startline, startcolumn, endline, endcolumn) and
14-
filepath = file.regexpReplaceAll("^/.*/tools/builtins/", "/BUILTINS/")
14+
filepath =
15+
file.regexpReplaceAll("^/.*/tools/builtins/", "/BUILTINS/")
16+
.regexpReplaceAll("^/.*/.rustup/toolchains/[^/]+/", "/RUSTUP_HOME/toolchain/")
1517
)
1618
}
1719
}

0 commit comments

Comments
 (0)