Rust: Add type inference regression test

Author: hvitved

rust/ql/test/library-tests/type-inference/overloading.rs

@@ -236,3 +236,44 @@ mod default_type_args {
         }
     }
 }
+
+mod from_default {
+    #[derive(Default)]
+    struct S;
+
+    fn f() -> S {
+        let x = Default::default(); // $ target=default type=x:S
+        From::from(x) // $ target=from
+    }
+
+    struct S1;
+
+    struct S2;
+
+    impl From<S> for S1 {
+        // from1
+        fn from(_: S) -> Self {
+            S1
+        }
+    }
+
+    impl From<S2> for S1 {
+        // from2
+        fn from(_: S2) -> Self {
+            S1
+        }
+    }
+
+    impl From<S> for S2 {
+        // from3
+        fn from(_: S) -> Self {
+            S2
+        }
+    }
+
+    fn g(b: bool) -> S1 {
+        let s = if b { S } else { Default::default() }; // $ target=default type=s:S
+        let x = From::from(s); // $ target=from1 type=x:S1
+        x
+    }
+}

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

@@ -3892,6 +3892,16 @@ inferCertainType
 | overloading.rs:230:21:230:47 | ...::f(...) |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:231:17:231:17 | x |  | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:231:21:231:61 | ...::f(...) |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:244:17:247:5 | { ... } |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:255:17:255:17 | _ |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:255:31:257:9 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:262:17:262:17 | _ |  | overloading.rs:251:5:251:14 | S2 |
+| overloading.rs:262:32:264:9 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:269:17:269:17 | _ |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:269:31:271:9 | { ... } |  | overloading.rs:251:5:251:14 | S2 |
+| overloading.rs:274:10:274:10 | b |  | {EXTERNAL LOCATION} | bool |
+| overloading.rs:274:25:278:5 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:275:20:275:20 | b |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:15:5:18:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
@@ -12282,6 +12292,33 @@ inferType
 | overloading.rs:235:13:235:16 | S(...) | T | {EXTERNAL LOCATION} | i32 |
 | overloading.rs:235:13:235:16 | S(...) | T | {EXTERNAL LOCATION} | i64 |
 | overloading.rs:235:15:235:15 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:244:17:247:5 | { ... } |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:245:13:245:13 | x |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:245:17:245:34 | ...::default(...) |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:246:9:246:21 | ...::from(...) |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:246:20:246:20 | x |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:255:17:255:17 | _ |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:255:31:257:9 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:256:13:256:14 | S1 |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:262:17:262:17 | _ |  | overloading.rs:251:5:251:14 | S2 |
+| overloading.rs:262:32:264:9 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:263:13:263:14 | S1 |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:269:17:269:17 | _ |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:269:31:271:9 | { ... } |  | overloading.rs:251:5:251:14 | S2 |
+| overloading.rs:270:13:270:14 | S2 |  | overloading.rs:251:5:251:14 | S2 |
+| overloading.rs:274:10:274:10 | b |  | {EXTERNAL LOCATION} | bool |
+| overloading.rs:274:25:278:5 | { ... } |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:275:13:275:13 | s |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:275:17:275:54 | if b {...} else {...} |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:275:20:275:20 | b |  | {EXTERNAL LOCATION} | bool |
+| overloading.rs:275:22:275:26 | { ... } |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:275:24:275:24 | S |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:275:33:275:54 | { ... } |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:275:35:275:52 | ...::default(...) |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:276:13:276:13 | x |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:276:17:276:29 | ...::from(...) |  | overloading.rs:249:5:249:14 | S1 |
+| overloading.rs:276:28:276:28 | s |  | overloading.rs:241:5:242:13 | S |
+| overloading.rs:277:9:277:9 | x |  | overloading.rs:249:5:249:14 | S1 |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:14:9:14:13 | value |  | {EXTERNAL LOCATION} | Option |