wip: down to 13 errors

This commit is contained in:
🪞👃🪞 2025-05-14 14:35:19 +03:00
parent 6ce83fb27a
commit ebdb8881e9
19 changed files with 793 additions and 691 deletions

View file

@ -13,9 +13,9 @@ pub trait HasSelection: Has<Selection> {
impl Has<Option<Track>> for Arrangement {
fn get (&self) -> &Option<Track> {
Has::<Option<Selection>>::get(self)
.and_then(|selection|selection.track())
.and_then(|index|Has::<Vec<Track>>::get(self).get(index))
let selection: Selection = Has::<Option<Track>>::get(self)?;
let index: Option<usize> = selection.track()?;
let track: Track = Has::<Vec<Track>>::get(self).get(index)?;
}
fn get_mut (&mut self) -> &mut Option<Track> {
Has::<Option<Selection>>::get(self)
@ -33,7 +33,7 @@ impl Has<Option<Scene>> for Arrangement {
fn get_mut (&mut self) -> &mut Option<Scene> {
Has::<Option<Selection>>::get(self)
.and_then(|selection|selection.track())
.and_then(|index|Has::<Vec<Scene>>::get_mut(self).get_mut(index))
.and_then(|index|Has::<Vec<Scene>>::get_mut(self).get_mut(index).as_deref())
}
}