Don't duplicate handling of Visibility::Crate

Instead, represent it as just another `Restricted` path.

Author: jyn514

src/librustdoc/clean/mod.rs

@@ -1753,7 +1753,10 @@ impl Clean<Visibility> for hir::Visibility<'_> {
         match self.node {
             hir::VisibilityKind::Public => Visibility::Public,
             hir::VisibilityKind::Inherited => Visibility::Inherited,
-            hir::VisibilityKind::Crate(_) => Visibility::Crate,
+            hir::VisibilityKind::Crate(_) => {
+                let krate = DefId::local(CRATE_DEF_INDEX);
+                Visibility::Restricted(krate, cx.tcx.def_path(krate))
+            }
             hir::VisibilityKind::Restricted { ref path, .. } => {
                 let path = path.clean(cx);
                 let did = register_res(cx, path.res);
@@ -1767,14 +1770,10 @@ impl Clean<Visibility> for ty::Visibility {
     fn clean(&self, cx: &DocContext<'_>) -> Visibility {
         match *self {
             ty::Visibility::Public => Visibility::Public,
+            ty::Visibility::Invisible => Visibility::Inherited,
             ty::Visibility::Restricted(module) => {
-                if module.is_top_level_module() {
-                    Visibility::Crate
-                } else {
-                    Visibility::Restricted(module, cx.tcx.def_path(module))
-                }
+                Visibility::Restricted(module, cx.tcx.def_path(module))
             }
-            ty::Visibility::Invisible => Visibility::Inherited,
         }
     }
 }

src/librustdoc/clean/types.rs

@@ -1529,7 +1529,6 @@ impl From<hir::PrimTy> for PrimitiveType {
 pub enum Visibility {
     Public,
     Inherited,
-    Crate,
     Restricted(DefId, rustc_hir::definitions::DefPath),
 }
 

src/librustdoc/html/format.rs

@@ -1094,7 +1094,6 @@ impl clean::Visibility {
         display_fn(move |f| match *self {
             clean::Public => f.write_str("pub "),
             clean::Inherited => Ok(()),
-            clean::Visibility::Crate => write!(f, "pub(crate) "),
             // If this is `pub(crate)`, `path` will be empty.
             clean::Visibility::Restricted(did, _) if did.index == CRATE_DEF_INDEX => {
                 write!(f, "pub(crate) ")