diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-05-31 16:50:44 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-06-05 07:43:14 +1000 |
| commit | 8797e8cabdd47d1731bbd12099d0cd5503d22d76 (patch) | |
| tree | ac1a9e18eace5099559d8b95ca5223c73c42ad25 /src/libsyntax_pos/lib.rs | |
| parent | 97c9437585edafb59dc24701578dc0f20756178c (diff) | |
| download | rust-8797e8cabdd47d1731bbd12099d0cd5503d22d76.tar.gz rust-8797e8cabdd47d1731bbd12099d0cd5503d22d76.zip | |
Move `modern` calls inside `glob_adjust` and `reverse_glob_adjust`.
Diffstat (limited to 'src/libsyntax_pos/lib.rs')
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index 30e075a3396..9bab95efd1b 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -535,19 +535,18 @@ impl Span { } #[inline] - pub fn glob_adjust(&mut self, expansion: Mark, glob_ctxt: SyntaxContext) - -> Option<Option<Mark>> { + pub fn glob_adjust(&mut self, expansion: Mark, glob_span: Span) -> Option<Option<Mark>> { let mut span = self.data(); - let mark = span.ctxt.glob_adjust(expansion, glob_ctxt); + let mark = span.ctxt.glob_adjust(expansion, glob_span); *self = Span::new(span.lo, span.hi, span.ctxt); mark } #[inline] - pub fn reverse_glob_adjust(&mut self, expansion: Mark, glob_ctxt: SyntaxContext) + pub fn reverse_glob_adjust(&mut self, expansion: Mark, glob_span: Span) -> Option<Option<Mark>> { let mut span = self.data(); - let mark = span.ctxt.reverse_glob_adjust(expansion, glob_ctxt); + let mark = span.ctxt.reverse_glob_adjust(expansion, glob_span); *self = Span::new(span.lo, span.hi, span.ctxt); mark } |