language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move AttrId back into hir_def

Browse source
This commit is contained in:
Jonas Schievink 2021-05-10 16:35:06 +02:00
parent 07cea5e709
commit a87bec5148
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_expand/src/builtin_derive.rs
View file

@ -269,7 +269,7 @@ mod tests {
use expect_test::{expect, Expect};
use name::AsName;
use crate::{test_db::TestDB, AstId, AttrId, MacroCallId, MacroCallKind, MacroCallLoc};
use crate::{test_db::TestDB, AstId, MacroCallId, MacroCallKind, MacroCallLoc};
use super::*;
@ -320,7 +320,7 @@ $0
kind: MacroCallKind::Derive {
ast_id,
derive_name: name.to_string(),
derive_attr: AttrId(0),
derive_attr_index: 0,
},
};

5
crates/hir_expand/src/lib.rs
View file

@ -293,12 +293,9 @@ pub struct MacroCallLoc {
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum MacroCallKind {
FnLike { ast_id: AstId<ast::MacroCall>, fragment: FragmentKind },
Derive { ast_id: AstId<ast::Item>, derive_name: String, derive_attr: AttrId },
Derive { ast_id: AstId<ast::Item>, derive_name: String, derive_attr_index: u32 },
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct AttrId(pub u32);
impl MacroCallKind {
fn file_id(&self) -> HirFileId {
match self {