Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

3 files changed, 17 insertions, 10 deletions

diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
index 57745322f..011e4612c 100644
--- a/crates/hir_def/Cargo.toml
+++ b/crates/hir_def/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "hir_def"
 version = "0.0.0"
+description = "TBD"
 license = "MIT OR Apache-2.0"
 authors = ["rust-analyzer developers"]
 edition = "2018"
@@ -20,16 +21,16 @@ itertools = "0.9.0"
 indexmap = "1.4.0"
 smallvec = "1.4.0"
 
-stdx = { path = "../stdx" }
-arena = { path = "../arena" }
-base_db = { path = "../base_db" }
-syntax = { path = "../syntax" }
-profile = { path = "../profile" }
-hir_expand = { path = "../hir_expand" }
-test_utils = { path = "../test_utils" }
-mbe = { path = "../mbe" }
-cfg = { path = "../cfg" }
-tt = { path = "../tt" }
+stdx = { path = "../stdx", version = "0.0.0" }
+arena = { path = "../arena", version = "0.0.0" }
+base_db = { path = "../base_db", version = "0.0.0" }
+syntax = { path = "../syntax", version = "0.0.0" }
+profile = { path = "../profile", version = "0.0.0" }
+hir_expand = { path = "../hir_expand", version = "0.0.0" }
+test_utils = { path = "../test_utils", version = "0.0.0" }
+mbe = { path = "../mbe", version = "0.0.0" }
+cfg = { path = "../cfg", version = "0.0.0" }
+tt = { path = "../tt", version = "0.0.0" }
 
 [dev-dependencies]
 expect-test = "0.1"
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 391ab5d39..6a503d785 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -557,6 +557,10 @@ impl Ctx {
                             let statik = self.lower_static(&ast)?;
                             statik.into()
                         }
+                        ast::ExternItem::TypeAlias(ty) => {
+                            let id = self.lower_type_alias(&ty)?;
+                            id.into()
+                        }
                         ast::ExternItem::MacroCall(_) => return None,
                     };
                     self.add_attrs(id.into(), attrs);
diff --git a/crates/hir_def/src/nameres/tests.rs b/crates/hir_def/src/nameres/tests.rs
index 8aaf7a158..5ca30dac9 100644
--- a/crates/hir_def/src/nameres/tests.rs
+++ b/crates/hir_def/src/nameres/tests.rs
@@ -46,6 +46,7 @@ union U { to_be: bool, not_to_be: u8 }
 enum E { V }
 
 extern {
+    type Ext;
     static EXT: u8;
     fn ext();
 }
@@ -65,6 +66,7 @@ extern {
             Baz: t v
             E: t
             EXT: v
+            Ext: t
             U: t
             ext: v
         "#]],