From e837df84792d2cbf5c606788c7cab7ea4d1829d0 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 10 Feb 2021 14:41:54 +0100
Subject: infer: update resolver when descending into block

---
 crates/hir_ty/src/tests/simple.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'crates/hir_ty/src/tests')

diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index 16682f76f..ab21332fb 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -2415,3 +2415,22 @@ fn infer_const_params() {
         "#]],
     );
 }
+
+#[test]
+fn infer_inner_type() {
+    check_infer(r#"
+        fn foo() {
+            struct S { field: u32 }
+            let s = S { field: 0 };
+            let f = s.field;
+        }
+    "#, expect![[r#"
+        9..89 '{     ...eld; }': ()
+        47..48 's': S
+        51..65 'S { field: 0 }': S
+        62..63 '0': u32
+        75..76 'f': u32
+        79..80 's': S
+        79..86 's.field': u32
+    "#]]);
+}
-- 
cgit v1.2.3


From 244d8e37f1cf42e30d3b668dfb088813e54adee2 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 10 Feb 2021 14:48:52 +0100
Subject: Update fixed tests

---
 crates/hir_ty/src/tests/simple.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'crates/hir_ty/src/tests')

diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index ab21332fb..b364c2e58 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -2418,13 +2418,15 @@ fn infer_const_params() {
 
 #[test]
 fn infer_inner_type() {
-    check_infer(r#"
+    check_infer(
+        r#"
         fn foo() {
             struct S { field: u32 }
             let s = S { field: 0 };
             let f = s.field;
         }
-    "#, expect![[r#"
+    "#,
+        expect![[r#"
         9..89 '{     ...eld; }': ()
         47..48 's': S
         51..65 'S { field: 0 }': S
@@ -2432,5 +2434,6 @@ fn infer_inner_type() {
         75..76 'f': u32
         79..80 's': S
         79..86 's.field': u32
-    "#]]);
+    "#]],
+    );
 }
-- 
cgit v1.2.3


From 3c5734712a074a5bb3100dbec8b690e60b5beac0 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 10 Feb 2021 15:54:21 +0100
Subject: Add more tests

---
 crates/hir_ty/src/tests/simple.rs | 41 +++++++++++++++++++++++++------
 crates/hir_ty/src/tests/traits.rs | 51 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 8 deletions(-)

(limited to 'crates/hir_ty/src/tests')

diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index b364c2e58..20ceb7415 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -2427,13 +2427,38 @@ fn infer_inner_type() {
         }
     "#,
         expect![[r#"
-        9..89 '{     ...eld; }': ()
-        47..48 's': S
-        51..65 'S { field: 0 }': S
-        62..63 '0': u32
-        75..76 'f': u32
-        79..80 's': S
-        79..86 's.field': u32
-    "#]],
+            9..89 '{     ...eld; }': ()
+            47..48 's': S
+            51..65 'S { field: 0 }': S
+            62..63 '0': u32
+            75..76 'f': u32
+            79..80 's': S
+            79..86 's.field': u32
+        "#]],
+    );
+}
+
+#[test]
+fn infer_nested_inner_type() {
+    check_infer(
+        r#"
+        fn foo() {
+            {
+                let s = S { field: 0 };
+                let f = s.field;
+            }
+            struct S { field: u32 }
+        }
+    "#,
+        expect![[r#"
+            9..109 '{     ...32 } }': ()
+            15..79 '{     ...     }': ()
+            29..30 's': S
+            33..47 'S { field: 0 }': S
+            44..45 '0': u32
+            61..62 'f': u32
+            65..66 's': S
+            65..72 's.field': u32
+        "#]],
     );
 }
diff --git a/crates/hir_ty/src/tests/traits.rs b/crates/hir_ty/src/tests/traits.rs
index e5a3f95a6..e030f4a97 100644
--- a/crates/hir_ty/src/tests/traits.rs
+++ b/crates/hir_ty/src/tests/traits.rs
@@ -3151,3 +3151,54 @@ fn test() {
     "#,
     );
 }
+
+#[test]
+fn inner_use() {
+    check_types(
+        r#"
+mod m {
+    pub trait Tr {
+        fn method(&self) -> u8 { 0 }
+    }
+
+    impl Tr for () {}
+}
+
+fn f() {
+    use m::Tr;
+
+    ().method();
+  //^^^^^^^^^^^ u8
+}
+        "#,
+    );
+}
+
+#[test]
+fn inner_use_in_block() {
+    check_types(
+        r#"
+mod m {
+    pub trait Tr {
+        fn method(&self) -> u8 { 0 }
+    }
+
+    impl Tr for () {}
+}
+
+fn f() {
+    {
+        use m::Tr;
+
+        ().method();
+      //^^^^^^^^^^^ u8
+    }
+
+    {
+        ().method();
+      //^^^^^^^^^^^ {unknown}
+    }
+}
+        "#,
+    );
+}
-- 
cgit v1.2.3