More code-review stuf

Co-authored-by: León Orell Valerian Liehr <[email protected]>

Author: aDotInTheVoid

src/librustdoc/json/ids.rs

@@ -19,7 +19,7 @@ pub(super) type IdInterner = FxHashMap<FullItemId, types::Id>;
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
 /// An uninterned id.
 ///
-/// One of these corresponds to every:
+/// Each one corresponds to exactly one of both:
 /// 1. [`rustdoc_json_types::Item`].
 /// 2. [`rustdoc_json_types::Id`] transitively (as each `Item` has an `Id`).
 ///
@@ -42,16 +42,16 @@ pub(super) struct FullItemId {
     ///    E.g:
     ///
     ///    ```rust
-    ///     mod module {
-    ///         pub struct Foo {} // Exists in type namespace
-    ///         pub fn Foo(){} // Exists in value namespace
-    ///     }
+    ///    mod module {
+    ///        pub struct Foo {} // Exists in type namespace
+    ///        pub fn Foo(){} // Exists in value namespace
+    ///    }
+    ///    
+    ///    pub use module::Foo; // Imports both items
+    ///    ```
     ///
-    ///     pub use module::Foo; // Imports both items
-    ///     ```
-    ///
-    ///     In HIR, the `pub use` is just 1 item, but in rustdoc-json it's 2, so
-    ///     we need to disambiguate.
+    ///    In HIR, the `pub use` is just 1 item, but in rustdoc-json it's 2, so
+    ///    we need to disambiguate.
     extra_id: Option<DefId>,
 
     /// Needed for `#[rustc_doc_primitive]` modules.
@@ -76,8 +76,8 @@ impl JsonRenderer<'_> {
         name: Option<Symbol>,
         imported_id: Option<DefId>,
     ) -> types::Id {
-        let (def_id, mut extra_id) = match item_id {
-            clean::ItemId::DefId(did) => (did, None),
+        let (def_id, extra_id) = match item_id {
+            clean::ItemId::DefId(did) => (did, imported_id),
             clean::ItemId::Blanket { for_, impl_id } => (for_, Some(impl_id)),
             clean::ItemId::Auto { for_, trait_ } => (for_, Some(trait_)),
         };
@@ -101,11 +101,6 @@ impl JsonRenderer<'_> {
             }
         };
 
-        if let Some(imported_id) = imported_id {
-            assert_eq!(extra_id, None, "On an import item, so won't have extra from impl");
-            extra_id = Some(imported_id);
-        }
-
         let key = FullItemId { def_id, extra_id, name };
 
         let mut interner = self.id_interner.borrow_mut();