diff options
author | Jonas Schievink <[email protected]> | 2020-12-15 19:33:05 +0000 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-12-15 19:33:05 +0000 |
commit | b238ddd21adf9910769522a21e31c2e14f664396 (patch) | |
tree | 219749056bcef5cd35cfc94826108c4f955b1c8b /crates/hir_expand/src/lib.rs | |
parent | c31c3246a8c87a3639623c30b692a57e728bb046 (diff) |
Make macro def krate mandatory
Refactors builtin derive support to go through proper name resolution
Diffstat (limited to 'crates/hir_expand/src/lib.rs')
-rw-r--r-- | crates/hir_expand/src/lib.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index 55f026c7b..d486186e5 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs | |||
@@ -224,13 +224,7 @@ impl From<EagerMacroId> for MacroCallId { | |||
224 | 224 | ||
225 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 225 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
226 | pub struct MacroDefId { | 226 | pub struct MacroDefId { |
227 | // FIXME: krate and ast_id are currently optional because we don't have a | 227 | pub krate: CrateId, |
228 | // definition location for built-in derives. There is one, though: the | ||
229 | // standard library defines them. The problem is that it uses the new | ||
230 | // `macro` syntax for this, which we don't support yet. As soon as we do | ||
231 | // (which will probably require touching this code), we can instead use | ||
232 | // that (and also remove the hacks for resolving built-in derives). | ||
233 | pub krate: Option<CrateId>, | ||
234 | pub ast_id: Option<AstId<ast::Macro>>, | 228 | pub ast_id: Option<AstId<ast::Macro>>, |
235 | pub kind: MacroDefKind, | 229 | pub kind: MacroDefKind, |
236 | 230 | ||