aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ids.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-03-26 15:57:57 +0000
committerAleksey Kladov <[email protected]>2019-03-26 15:57:57 +0000
commitb17217b34afbdbdc6b1d8ec480fcf06ec4bd587e (patch)
tree198b942a591d783dfcade9c1c6dc04920bafa9b5 /crates/ra_hir/src/ids.rs
parentcffa3f960e401ac8100fd450b32c336c93181959 (diff)
simplify
Diffstat (limited to 'crates/ra_hir/src/ids.rs')
-rw-r--r--crates/ra_hir/src/ids.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index c2df5ce00..81b3cfd22 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -82,7 +82,10 @@ impl HirFileId {
82 } 82 }
83 } 83 }
84 84
85 pub(crate) fn hir_parse(db: &impl DefDatabase, file_id: HirFileId) -> TreeArc<SourceFile> { 85 pub(crate) fn hir_parse_query(
86 db: &impl DefDatabase,
87 file_id: HirFileId,
88 ) -> TreeArc<SourceFile> {
86 match file_id.0 { 89 match file_id.0 {
87 HirFileIdRepr::File(file_id) => db.parse(file_id), 90 HirFileIdRepr::File(file_id) => db.parse(file_id),
88 HirFileIdRepr::Macro(macro_call_id) => { 91 HirFileIdRepr::Macro(macro_call_id) => {
@@ -122,7 +125,6 @@ impl From<MacroCallId> for HirFileId {
122} 125}
123 126
124#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 127#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
125
126pub struct MacroDefId(pub(crate) AstId<ast::MacroCall>); 128pub struct MacroDefId(pub(crate) AstId<ast::MacroCall>);
127 129
128pub(crate) fn macro_def_query(db: &impl DefDatabase, id: MacroDefId) -> Option<Arc<MacroRules>> { 130pub(crate) fn macro_def_query(db: &impl DefDatabase, id: MacroDefId) -> Option<Arc<MacroRules>> {
@@ -152,7 +154,6 @@ impl MacroCallId {
152} 154}
153 155
154impl MacroCallLoc { 156impl MacroCallLoc {
155 #[allow(unused)]
156 pub(crate) fn id(&self, db: &impl AsRef<HirInterner>) -> MacroCallId { 157 pub(crate) fn id(&self, db: &impl AsRef<HirInterner>) -> MacroCallId {
157 db.as_ref().macros.loc2id(&self) 158 db.as_ref().macros.loc2id(&self)
158 } 159 }