Skip to content

Commit 46ff94c

Browse files
committed
replace get_auto_splitter_settings with TimerQuery
1 parent 5a3e527 commit 46ff94c

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

src/auto_splitting/mod.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
//! - There is no threading.
543543
544544
use crate::{
545-
event::{self, TimerAutoSplitterSettings, TimerQuery},
545+
event::{self, TimerQuery},
546546
platform::Arc,
547547
timing::TimerPhase,
548548
};
@@ -599,15 +599,15 @@ impl<T> Drop for Runtime<T> {
599599
}
600600
}
601601

602-
impl<T: event::CommandSink + TimerQuery + TimerAutoSplitterSettings + Send + 'static> Default
602+
impl<T: event::CommandSink + TimerQuery + Send + 'static> Default
603603
for Runtime<T>
604604
{
605605
fn default() -> Self {
606606
Self::new()
607607
}
608608
}
609609

610-
impl<T: event::CommandSink + TimerQuery + TimerAutoSplitterSettings + Send + 'static> Runtime<T> {
610+
impl<T: event::CommandSink + TimerQuery + Send + 'static> Runtime<T> {
611611
/// Starts the runtime. Doesn't actually load an auto splitter until
612612
/// [`load`][Runtime::load] is called.
613613
pub fn new() -> Self {
@@ -668,9 +668,14 @@ impl<T: event::CommandSink + TimerQuery + TimerAutoSplitterSettings + Send + 'st
668668
compiled_auto_splitter: &CompiledAutoSplitter,
669669
timer: T,
670670
) -> Result<(), Error> {
671-
let settings_map = timer.get_auto_splitter_settings();
671+
let settings_map = timer
672+
.get_timer()
673+
.run()
674+
.parsed_auto_splitter_settings()
675+
.as_ref()
676+
.map(|p| p.custom_settings.clone());
672677
let auto_splitter = compiled_auto_splitter
673-
.instantiate(Timer(timer), Some(settings_map), None)
678+
.instantiate(Timer(timer), settings_map, None)
674679
.map_err(|e| Error::LoadFailed { source: e })?;
675680

676681
self.auto_splitter

src/event.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,6 @@ pub trait TimerQuery {
288288
#[cfg(feature = "auto-splitting")]
289289
/// Getting and setting the settings map for auto splitter settings.
290290
pub trait TimerAutoSplitterSettings {
291-
/// Gets an initial settings map from the auto splitter settings.
292-
fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map;
293-
294291
/// Set the settings map in the parsed auto splitter settings.
295292
fn set_auto_splitter_settings(&mut self, settings_map: livesplit_auto_splitting::settings::Map);
296293
}
@@ -520,14 +517,6 @@ impl<T: TimerQuery + ?Sized> TimerQuery for Arc<T> {
520517

521518
#[cfg(feature = "auto-splitting")]
522519
impl TimerAutoSplitterSettings for crate::timing::Timer {
523-
fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map {
524-
let run = self.run();
525-
if let Some(p) = run.parsed_auto_splitter_settings() {
526-
return p.custom_settings.clone();
527-
}
528-
livesplit_auto_splitting::settings::Map::new()
529-
}
530-
531520
fn set_auto_splitter_settings(
532521
&mut self,
533522
settings_map: livesplit_auto_splitting::settings::Map,
@@ -541,13 +530,6 @@ impl TimerAutoSplitterSettings for crate::timing::Timer {
541530

542531
#[cfg(feature = "auto-splitting")]
543532
impl TimerAutoSplitterSettings for crate::SharedTimer {
544-
fn get_auto_splitter_settings(&self) -> livesplit_auto_splitting::settings::Map {
545-
let Ok(t) = self.read() else {
546-
return livesplit_auto_splitting::settings::Map::new();
547-
};
548-
t.get_auto_splitter_settings()
549-
}
550-
551533
fn set_auto_splitter_settings(
552534
&mut self,
553535
settings_map: livesplit_auto_splitting::settings::Map,

0 commit comments

Comments
 (0)