diff options
| author | bors <bors@rust-lang.org> | 2019-05-30 16:54:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-30 16:54:13 +0000 |
| commit | 0bfbaa6e8dfb509b453020740fd37c7a22882c87 (patch) | |
| tree | 1ebe6b4f2e4fbb80aa87763f833c674bfd704d27 /src/libsyntax | |
| parent | aee7012fab26d5e307a2fe767e4e7c847c5a45ee (diff) | |
| parent | 95ea7fd735619089ea9a0e95e2f41170127df567 (diff) | |
| download | rust-0bfbaa6e8dfb509b453020740fd37c7a22882c87.tar.gz rust-0bfbaa6e8dfb509b453020740fd37c7a22882c87.zip | |
Auto merge of #61253 - nnethercote:avoid-hygiene_data-lookups, r=petrochenkov
Avoid `hygiene_data` lookups These commits mostly introduce compound operations that allow two close adjacent `hygiene_data` lookups to be combined. r? @petrochenkov
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/source_map.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index d72193ffe12..4b5b9ff7bbe 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -872,7 +872,7 @@ impl<'a> ExtCtxt<'a> { let mut ctxt = self.backtrace(); let mut last_macro = None; loop { - if ctxt.outer().expn_info().map_or(None, |info| { + if ctxt.outer_expn_info().map_or(None, |info| { if info.format.name() == sym::include { // Stop going up the backtrace once include! is encountered return None; diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index e2171a84e23..4b6893b2423 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -30,8 +30,8 @@ use errors::SourceMapper; /// otherwise return the call site span up to the `enclosing_sp` by /// following the `expn_info` chain. pub fn original_sp(sp: Span, enclosing_sp: Span) -> Span { - let call_site1 = sp.ctxt().outer().expn_info().map(|ei| ei.call_site); - let call_site2 = enclosing_sp.ctxt().outer().expn_info().map(|ei| ei.call_site); + let call_site1 = sp.ctxt().outer_expn_info().map(|ei| ei.call_site); + let call_site2 = enclosing_sp.ctxt().outer_expn_info().map(|ei| ei.call_site); match (call_site1, call_site2) { (None, _) => sp, (Some(call_site1), Some(call_site2)) if call_site1 == call_site2 => sp, |