user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add HygieneData::adjust.

Browse source
This commit is contained in:
Nicholas Nethercote 2019-06-01 07:44:14 +10:00
parent cd64cc835d
commit 88fd7a8eb7
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax_pos/hygiene.rs
View file

@ -243,6 +243,14 @@ impl HygieneData {
*ctxt = self.prev_ctxt(*ctxt);
outer_mark
}
fn adjust(&self, ctxt: &mut SyntaxContext, expansion: Mark) -> Option<Mark> {
let mut scope = None;
while !self.is_descendant_of(expansion, self.outer(*ctxt)) {
scope = Some(self.remove_mark(ctxt));
}
scope
}
}
pub fn clear_markings() {
@ -455,11 +463,7 @@ impl SyntaxContext {
/// This returns the expansion whose definition scope we use to privacy check the resolution,
/// or `None` if we privacy check as usual (i.e., not w.r.t. a macro definition scope).
pub fn adjust(&mut self, expansion: Mark) -> Option<Mark> {
let mut scope = None;
while !expansion.outer_is_descendant_of(*self) {
scope = Some(self.remove_mark());
}
scope
HygieneData::with(|data| data.adjust(self, expansion))
}
/// Adjust this context for resolution in a scope created by the given expansion