Skip to content

Commit 7bec8c9

Browse files
committed
Add HygieneData::default_transparency.
Also use `HygieneData::expn_info` in an appropriate place.
1 parent 0ba36ea commit 7bec8c9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/libsyntax_pos/hygiene.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl Mark {
9898

9999
#[inline]
100100
pub fn expn_info(self) -> Option<ExpnInfo> {
101-
HygieneData::with(|data| data.marks[self.0 as usize].expn_info.clone())
101+
HygieneData::with(|data| data.expn_info(self))
102102
}
103103

104104
#[inline]
@@ -214,6 +214,10 @@ impl HygieneData {
214214
true
215215
}
216216

217+
fn default_transparency(&self, mark: Mark) -> Transparency {
218+
self.marks[mark.0 as usize].default_transparency
219+
}
220+
217221
fn modern(&self, ctxt: SyntaxContext) -> SyntaxContext {
218222
self.syntax_contexts[ctxt.0 as usize].opaque
219223
}
@@ -287,7 +291,7 @@ impl SyntaxContext {
287291
pub fn apply_mark(self, mark: Mark) -> SyntaxContext {
288292
assert_ne!(mark, Mark::root());
289293
self.apply_mark_with_transparency(
290-
mark, HygieneData::with(|data| data.marks[mark.0 as usize].default_transparency)
294+
mark, HygieneData::with(|data| data.default_transparency(mark))
291295
)
292296
}
293297

0 commit comments

Comments
 (0)