diff options
| author | bors <bors@rust-lang.org> | 2020-06-11 18:11:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-11 18:11:07 +0000 |
| commit | a37c32e2d5fb186627ffe99a391c7fd6fd159334 (patch) | |
| tree | df7e39d8ffe113bd11f9cf75a54bec2157d219b8 /src/librustc_interface | |
| parent | 50c0192c64241d723066add22c53d472e2b9cba9 (diff) | |
| parent | 8650df5dea7a27852a7fa6bd2585905abb521db7 (diff) | |
Auto merge of #73246 - Dylan-DPC:rollup-xnm531f, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #72180 (remove extra space from crate-level doctest names) - #73012 (Show `SyntaxContext` in formatted `Span` debug output) - #73097 (Try_run must only be used if toolstate is populated) - #73169 (Handle assembler warnings properly) - #73182 (Track span of function in method calls, and use this in #[track_caller]) - #73207 (Clean up E0648 explanation) - #73230 (Suggest including unused asm arguments in a comment to avoid error) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/callbacks.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_interface/callbacks.rs b/src/librustc_interface/callbacks.rs index 913c67d045e..7fa1a3eb0f5 100644 --- a/src/librustc_interface/callbacks.rs +++ b/src/librustc_interface/callbacks.rs @@ -18,7 +18,7 @@ use std::fmt; fn span_debug(span: rustc_span::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result { tls::with_opt(|tcx| { if let Some(tcx) = tcx { - write!(f, "{}", tcx.sess.source_map().span_to_string(span)) + rustc_span::debug_with_source_map(span, f, tcx.sess.source_map()) } else { rustc_span::default_span_debug(span, f) } |
