caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-18 19:15:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

add and use Sink::extend_tracked

Browse Source 
avoids an unnecessary sink extension if the sink is empty
This commit is contained in:
PgBiel 2024-06-14 16:27:47 -03:00
parent b559fc20b7
commit 33588ab239
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crates/typst/src/engine.rs
View File

@ -79,8 +79,7 @@ impl Engine<'_> {
// Apply the subsinks to the outer sink. // Apply the subsinks to the outer sink.
for (_, sink) in &mut pairs { for (_, sink) in &mut pairs {
let sink = std::mem::take(sink); Sink::extend_tracked(&mut self.sink, std::mem::take(sink));
self.sink.extend(sink.delayed, sink.warnings, sink.values);
} }
pairs.into_iter().map(|(output, _)| output) pairs.into_iter().map(|(output, _)| output)
@ -122,7 +121,7 @@ impl Engine<'_> {
// Push the accumulated warnings and other fields back to the // Push the accumulated warnings and other fields back to the
// original sink after we have modified them. This is needed so the // original sink after we have modified them. This is needed so the
// warnings are properly returned by compilation later. // warnings are properly returned by compilation later.
self.sink.extend(sink.delayed, sink.warnings, sink.values); Sink::extend_tracked(&mut self.sink, sink);
call_result call_result
} }
@ -187,6 +186,16 @@ impl Sink {
Self::default() Self::default()
} }
/// Extend the destination sink with the data from the source sink.
/// This calls a tracked function on the destination unless the source
/// is fully empty (which is usually the case).
pub fn extend_tracked(destination: &mut TrackedMut<'_, Self>, source: Sink) {
let Sink { delayed, warnings, values, .. } = source;
if !delayed.is_empty() || !warnings.is_empty() || !values.is_empty() {
destination.extend(delayed, warnings, values);
}
}
/// Get the stored delayed errors. /// Get the stored delayed errors.
pub fn delayed(&mut self) -> EcoVec<SourceDiagnostic> { pub fn delayed(&mut self) -> EcoVec<SourceDiagnostic> {
std::mem::take(&mut self.delayed) std::mem::take(&mut self.delayed)
@ -202,18 +211,6 @@ impl Sink {
self.values self.values
} }
/// Takes and returns all fields from this sink:
/// delayed errors, warnings and traced values.
pub fn take(
self,
) -> (
EcoVec<SourceDiagnostic>,
EcoVec<SourceDiagnostic>,
EcoVec<(Value, Option<Styles>)>,
) {
(self.delayed, self.warnings, self.values)
}
/// Adds a tracepoint to all warnings outside the given span. /// Adds a tracepoint to all warnings outside the given span.
pub fn trace_warnings<F>( pub fn trace_warnings<F>(
&mut self, &mut self,
@ -269,7 +266,10 @@ impl Sink {
} }
/// Extend from another sink. /// Extend from another sink.
pub fn extend( /// Using `Sink::extend_tracked` is preferable as it avoids a call to this
/// function if all arguments are empty, thus avoiding an unnecessary
/// tracked call in most cases.
fn extend(
&mut self, &mut self,
delayed: EcoVec<SourceDiagnostic>, delayed: EcoVec<SourceDiagnostic>,
warnings: EcoVec<SourceDiagnostic>, warnings: EcoVec<SourceDiagnostic>,