about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-30 16:54:13 +0000
committerbors <bors@rust-lang.org>2019-05-30 16:54:13 +0000
commit0bfbaa6e8dfb509b453020740fd37c7a22882c87 (patch)
tree1ebe6b4f2e4fbb80aa87763f833c674bfd704d27 /src/libsyntax_ext
parentaee7012fab26d5e307a2fe767e4e7c847c5a45ee (diff)
parent95ea7fd735619089ea9a0e95e2f41170127df567 (diff)
downloadrust-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_ext')
-rw-r--r--src/libsyntax_ext/proc_macro_server.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs
index 53730d2d080..cc05ecf8df5 100644
--- a/src/libsyntax_ext/proc_macro_server.rs
+++ b/src/libsyntax_ext/proc_macro_server.rs
@@ -680,7 +680,7 @@ impl server::Span for Rustc<'_> {
         self.sess.source_map().lookup_char_pos(span.lo()).file
     }
     fn parent(&mut self, span: Self::Span) -> Option<Self::Span> {
-        span.ctxt().outer().expn_info().map(|i| i.call_site)
+        span.ctxt().outer_expn_info().map(|i| i.call_site)
     }
     fn source(&mut self, span: Self::Span) -> Self::Span {
         span.source_callsite()