From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Fri, 31 May 2019 21:24:51 +0000 (+1000)
Subject: Add `HygieneData::default_transparency`.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=7bec8c94b47054c09e01564e478f044850fbf178;p=rust.git

Add `HygieneData::default_transparency`.

Also use `HygieneData::expn_info` in an appropriate place.
---

diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs
index c23d27879f7..1f09bb1df71 100644
--- a/src/libsyntax_pos/hygiene.rs
+++ b/src/libsyntax_pos/hygiene.rs
@@ -98,7 +98,7 @@ pub fn parent(self) -> Mark {
 
     #[inline]
     pub fn expn_info(self) -> Option<ExpnInfo> {
-        HygieneData::with(|data| data.marks[self.0 as usize].expn_info.clone())
+        HygieneData::with(|data| data.expn_info(self))
     }
 
     #[inline]
@@ -214,6 +214,10 @@ fn is_descendant_of(&self, mut mark: Mark, ancestor: Mark) -> bool {
         true
     }
 
+    fn default_transparency(&self, mark: Mark) -> Transparency {
+        self.marks[mark.0 as usize].default_transparency
+    }
+
     fn modern(&self, ctxt: SyntaxContext) -> SyntaxContext {
         self.syntax_contexts[ctxt.0 as usize].opaque
     }
@@ -287,7 +291,7 @@ pub fn allocate_directly(expansion_info: ExpnInfo) -> Self {
     pub fn apply_mark(self, mark: Mark) -> SyntaxContext {
         assert_ne!(mark, Mark::root());
         self.apply_mark_with_transparency(
-            mark, HygieneData::with(|data| data.marks[mark.0 as usize].default_transparency)
+            mark, HygieneData::with(|data| data.default_transparency(mark))
         )
     }