Merge #682

682: remove Option<SourceFileItemId> hack r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 1 insertions, 4 deletions

diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs
index 1d77548f3..8df11a5f4 100644
--- a/crates/ra_hir/src/nameres/lower.rs
+++ b/crates/ra_hir/src/nameres/lower.rs
@@ -121,10 +121,7 @@ impl LoweredModule {
                     let item_id = file_items.id_of_unchecked(macro_call.syntax());
                     let loc = MacroCallLoc {
                         module,
-                        source_item_id: SourceItemId {
-                            file_id,
-                            item_id: Some(item_id),
-                        },
+                        source_item_id: SourceItemId { file_id, item_id },
                     };
                     let id = loc.id(db);
                     let file_id = HirFileId::from(id);