mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #3598

Browse Source 
3598: ra_hir_expand: migrate to impl_intern_key!() r=matklad a=Veetaha



Co-authored-by: Veetaha <gerzoh1@gmail.com>
Co-authored-by: Veetaha <veetaha2@gmail.com>
This commit is contained in:
bors[bot] 2020-03-16 09:41:38 +00:00 committed by GitHub
commit 6616f336b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ra_hir_expand/src/lib.rs
View File

@ -17,7 +17,7 @@ pub mod eager;
use std::hash::Hash;
use std::sync::Arc;
use ra_db::{salsa, CrateId, FileId};
use ra_db::{impl_intern_key, salsa, CrateId, FileId};
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<LazyMacroId> for MacroCallId {
fn from(it: LazyMacroId) -> Self {