1 files changed, 8 insertions, 4 deletions

diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs
index 6758411a0..c9e07de86 100644
--- a/crates/hir_def/src/lib.rs
+++ b/crates/hir_def/src/lib.rs
@@ -76,7 +76,11 @@ use stdx::impl_from;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ModuleId {
     krate: CrateId,
+    /// If this `ModuleId` was derived from a `DefMap` for a block expression, this stores the
+    /// `BlockId` of that block expression. If `None`, this module is part of the crate-level
+    /// `DefMap` of `krate`.
     block: Option<BlockId>,
+    /// The module's ID in its originating `DefMap`.
     pub local_id: LocalModuleId,
 }
 
@@ -87,7 +91,7 @@ impl ModuleId {
                 db.block_def_map(block).unwrap_or_else(|| {
                     // NOTE: This should be unreachable - all `ModuleId`s come from their `DefMap`s,
                     // so the `DefMap` here must exist.
-                    panic!("no `block_def_map` for `ModuleId` {:?}", self);
+                    unreachable!("no `block_def_map` for `ModuleId` {:?}", self);
                 })
             }
             None => db.crate_def_map(self.krate),
@@ -650,7 +654,7 @@ fn macro_call_as_call_id(
 ) -> Result<Result<MacroCallId, ErrorEmitted>, UnresolvedMacro> {
     let def: MacroDefId = resolver(call.path.clone()).ok_or(UnresolvedMacro)?;
 
-    let res = if let MacroDefKind::BuiltInEager(_) = def.kind {
+    let res = if let MacroDefKind::BuiltInEager(..) = def.kind {
         let macro_call = InFile::new(call.ast_id.file_id, call.ast_id.to_node(db.upcast()));
         let hygiene = Hygiene::new(db.upcast(), call.ast_id.file_id);
 
@@ -669,7 +673,7 @@ fn macro_call_as_call_id(
     Ok(res)
 }
 
-fn item_attr_as_call_id(
+fn derive_macro_as_call_id(
     item_attr: &AstIdWithPath<ast::Item>,
     db: &dyn db::DefDatabase,
     krate: CrateId,
@@ -681,7 +685,7 @@ fn item_attr_as_call_id(
         .as_lazy_macro(
             db.upcast(),
             krate,
-            MacroCallKind::Attr(item_attr.ast_id, last_segment.to_string()),
+            MacroCallKind::Derive(item_attr.ast_id, last_segment.to_string()),
         )
         .into();
     Ok(res)