From cbd9f46bc776cc6e7a0383af5e0053542400af55 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 15 Mar 2020 18:25:55 +0200 Subject: ra_hir_expand: migrate to impl_intern_key!() --- crates/ra_hir_expand/src/lib.rs | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 3fce73e8a..b3f2b09a6 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -17,7 +17,7 @@ pub mod eager; use std::hash::Hash; use std::sync::Arc; -use ra_db::{salsa, CrateId, FileId}; +use ra_db::{salsa, CrateId, FileId, impl_intern_key}; use ra_syntax::{ algo, ast::{self, AstNode}, @@ -174,25 +174,11 @@ pub enum MacroCallId { #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct LazyMacroId(salsa::InternId); -impl salsa::InternKey for LazyMacroId { - fn from_intern_id(v: salsa::InternId) -> Self { - LazyMacroId(v) - } - fn as_intern_id(&self) -> salsa::InternId { - self.0 - } -} +impl_intern_key!(LazyMacroId); #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct EagerMacroId(salsa::InternId); -impl salsa::InternKey for EagerMacroId { - fn from_intern_id(v: salsa::InternId) -> Self { - EagerMacroId(v) - } - fn as_intern_id(&self) -> salsa::InternId { - self.0 - } -} +impl_intern_key!(EagerMacroId); impl From for MacroCallId { fn from(it: LazyMacroId) -> Self { -- cgit v1.2.3