Rust: Add more type inference tests

Author: hvitved

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

@@ -1922,6 +1922,37 @@ mod method_determined_by_argument_type {
 
 mod dereference;
 
+mod explicit_type_args {
+    struct S1<T>(T);
+
+    #[derive(Default)]
+    struct S2;
+
+    impl<T : Default> S1<T> {
+        fn assoc_fun() -> Option<Self> {
+            None
+        }
+
+        fn default() -> Self {
+            S1(T::default())
+        }
+
+        fn method(self) -> Self {
+            self
+        }
+    }
+
+    type S3 = S1<S2>;
+
+    pub fn f() {
+        let x1 : Option<S1<S2>> = S1::assoc_fun(); // $ type=x1:T.T.S2
+        let x2 = S1::<S2>::assoc_fun(); // $ MISSING: type=x2:T.T.S2
+        let x3 = S3::assoc_fun(); // $ MISSING: type=x3:T.T.S2
+        let x4 = S1::<S2>::method(S1::default()); // $ MISSING: method=method type=x4:T.S2
+        let x5 = S3::method(S1::default()); // $ MISSING: method=method type=x5:T.S2
+    }
+}
+
 fn main() {
     field_access::f();
     method_impl::f();

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

@@ -3967,11 +3967,44 @@ inferType
 | main.rs:1919:9:1919:9 | x |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1919:9:1919:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:1919:18:1919:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1927:5:1927:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:1928:5:1928:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:1928:20:1928:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:1928:41:1928:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:1944:5:1944:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1929:12:1929:13 | S2 |  | main.rs:1928:5:1929:14 | S2 |
+| main.rs:1929:12:1929:13 | { ... } |  | main.rs:1928:5:1929:14 | S2 |
+| main.rs:1932:40:1934:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1932:40:1934:9 | { ... } | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1932:40:1934:9 | { ... } | T.T | main.rs:1931:10:1931:20 | T |
+| main.rs:1933:13:1933:16 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1933:13:1933:16 | None | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1933:13:1933:16 | None | T.T | main.rs:1931:10:1931:20 | T |
+| main.rs:1936:30:1938:9 | { ... } |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1936:30:1938:9 | { ... } | T | main.rs:1931:10:1931:20 | T |
+| main.rs:1937:13:1937:28 | S1(...) |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1937:13:1937:28 | S1(...) | T | main.rs:1931:10:1931:20 | T |
+| main.rs:1937:16:1937:27 | ...::default(...) |  | main.rs:1931:10:1931:20 | T |
+| main.rs:1940:19:1940:22 | SelfParam |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1940:19:1940:22 | SelfParam | T | main.rs:1931:10:1931:20 | T |
+| main.rs:1940:33:1942:9 | { ... } |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1940:33:1942:9 | { ... } | T | main.rs:1931:10:1931:20 | T |
+| main.rs:1941:13:1941:16 | self |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1941:13:1941:16 | self | T | main.rs:1931:10:1931:20 | T |
+| main.rs:1948:13:1948:14 | x1 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1948:13:1948:14 | x1 | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1948:13:1948:14 | x1 | T.T | main.rs:1928:5:1929:14 | S2 |
+| main.rs:1948:35:1948:49 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1948:35:1948:49 | ...::assoc_fun(...) | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1948:35:1948:49 | ...::assoc_fun(...) | T.T | main.rs:1928:5:1929:14 | S2 |
+| main.rs:1949:13:1949:14 | x2 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1949:13:1949:14 | x2 | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1949:18:1949:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1949:18:1949:38 | ...::assoc_fun(...) | T | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1951:13:1951:14 | x4 |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1951:18:1951:48 | ...::method(...) |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1951:35:1951:47 | ...::default(...) |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1952:29:1952:41 | ...::default(...) |  | main.rs:1926:5:1926:20 | S1 |
+| main.rs:1958:5:1958:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:1959:5:1959:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:1959:20:1959:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:1959:41:1959:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:1975:5:1975:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
 testFailures
 | main.rs:2:5:2:20 | f.write_str(...) | Unexpected result: method=write_str |
 | main.rs:5:5:5:20 | f.debug_struct(...) | Unexpected result: method=debug_struct |