Merge #7575

7575: Fix resolution of `self` module within blocks r=jonas-schievink a=jonas-schievink

bors r+

Co-authored-by: Jonas Schievink <[email protected]>

1 files changed, 10 insertions, 6 deletions

diff --git a/crates/hir_def/src/body/tests/block.rs b/crates/hir_def/src/body/tests/block.rs
index 062560a70..b599c6269 100644
--- a/crates/hir_def/src/body/tests/block.rs
+++ b/crates/hir_def/src/body/tests/block.rs
@@ -26,22 +26,26 @@ fn outer() {
 fn use_from_crate() {
     check_at(
         r#"
-struct Struct;
+struct Struct {}
 fn outer() {
-    use Struct;
+    fn Struct() {}
+    use Struct as PlainStruct;
     use crate::Struct as CrateStruct;
     use self::Struct as SelfStruct;
+    use super::Struct as SuperStruct;
     $0
 }
 "#,
         expect![[r#"
             block scope
-            CrateStruct: t v
-            SelfStruct: t v
-            Struct: t v
+            CrateStruct: t
+            PlainStruct: t v
+            SelfStruct: t
+            Struct: v
+            SuperStruct: _
 
             crate
-            Struct: t v
+            Struct: t
             outer: v
         "#]],
     );