fix: Allow public re-export of extern crate import

Author: ShoyuVanilla

crates/hir-def/src/nameres/collector.rs

@@ -45,6 +45,7 @@ use crate::{
     },
     path::{ImportAlias, ModPath, PathKind},
     per_ns::PerNs,
+    src::HasChildSource,
     tt,
     visibility::{RawVisibility, Visibility},
     AdtId, AstId, AstIdWithPath, ConstLoc, CrateRootModuleId, EnumLoc, EnumVariantLoc,
@@ -1058,8 +1059,34 @@ impl DefCollector<'_> {
         vis: Visibility,
         def_import_type: Option<ImportType>,
     ) -> bool {
-        if let Some((_, v, _)) = defs.types.as_mut() {
-            *v = v.min(vis, &self.def_map).unwrap_or(vis);
+        // `extern crate crate_name` things can be re-exported as `pub use crate_name`.
+        // But they cannot be re-exported as `pub use self::crate_name`, `pub use crate::crate_name`
+        // or `pub use ::crate_name`.
+        if let Some((_, v, it)) = defs.types.as_mut() {
+            let is_extern_crate_reimport_without_prefix = || {
+                let Some(ImportOrExternCrate::ExternCrate(_)) = it else {
+                    return false;
+                };
+                let Some(ImportType::Import(id)) = def_import_type else {
+                    return false;
+                };
+                let source = id.import.child_source(self.db);
+                let Some(use_tree_src) = source.value.get(id.idx) else {
+                    return false;
+                };
+                use_tree_src.top_use_tree().path().and_then(|p| p.first_segment()).is_some_and(
+                    |s| {
+                        s.crate_token().is_none()
+                            && s.self_token().is_none()
+                            && s.coloncolon_token().is_none()
+                    },
+                )
+            };
+            if is_extern_crate_reimport_without_prefix() {
+                *v = vis;
+            } else {
+                *v = v.min(vis, &self.def_map).unwrap_or(vis);
+            }
         }
         if let Some((_, v, _)) = defs.values.as_mut() {
             *v = v.min(vis, &self.def_map).unwrap_or(vis);

crates/hir-def/src/nameres/tests.rs

@@ -385,6 +385,41 @@ pub struct Arc;
     );
 }
 
+#[test]
+fn extern_crate_reexport() {
+    check(
+        r#"
+//- /main.rs crate:main deps:importer
+use importer::*;
+
+//- /importer.rs crate:importer deps:extern_crate
+extern crate extern_crate;
+
+pub use extern_crate::{self, exported::{self, *}, Exported};
+pub use ::extern_crate::NotExported1;
+pub use crate::extern_crate::NotExported2;
+pub use self::extern_crate::NotExported3;
+
+//- /extern_crate.rs crate:extern_crate
+pub mod exported {
+    pub struct PublicItem;
+    struct PrivateItem;
+}
+
+pub struct Exported;
+struct NotExported1;
+struct NotExported2;
+struct NotExported3;
+"#,
+        expect![[r#"
+            crate
+            Exported: t v
+            PublicItem: t v
+            exported: t
+        "#]],
+    );
+}
+
 #[test]
 fn extern_crate_rename_2015_edition() {
     check(