bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove an unnecessary use of with_session_globals.

Browse source 
We can easily pass in the source map.
This commit is contained in:
Nicholas Nethercote 2023-03-31 15:06:08 +11:00
parent c1d3610ac1
commit f049d5df10
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_span/src/profiling.rs
View file

@ -1,3 +1,5 @@
use crate::source_map::SourceMap;
use std::borrow::Borrow;
use rustc_data_structures::profiling::EventArgRecorder;
@ -11,25 +13,17 @@ pub trait SpannedEventArgRecorder {
///
/// Note: when self-profiling with costly event arguments, at least one argument
/// needs to be recorded. A panic will be triggered if that doesn't happen.
fn record_arg_with_span<A>(&mut self, event_arg: A, span: crate::Span)
fn record_arg_with_span<A>(&mut self, source_map: &SourceMap, event_arg: A, span: crate::Span)
where
A: Borrow<str> + Into<String>;
}
impl SpannedEventArgRecorder for EventArgRecorder<'_> {
fn record_arg_with_span<A>(&mut self, event_arg: A, span: crate::Span)
fn record_arg_with_span<A>(&mut self, source_map: &SourceMap, event_arg: A, span: crate::Span)
where
A: Borrow<str> + Into<String>,
{
self.record_arg(event_arg);
let span_arg = crate::with_session_globals(|session_globals| {
if let Some(source_map) = &*session_globals.source_map.borrow() {
source_map.span_to_embeddable_string(span)
} else {
format!("{span:?}")
}
});
self.record_arg(span_arg);
self.record_arg(source_map.span_to_embeddable_string(span));
}
}