chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaner version by using filters

Browse source
This commit is contained in:
Chris Cochrun 2023-04-13 09:38:21 -05:00
parent a2cd7294af
commit cf20c94c17
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/rust/slide_model.rs
View file

@ -600,10 +600,8 @@ mod slide_model {
for (i, slide) in slides_iter for (i, slide) in slides_iter
.enumerate() .enumerate()
.filter(|x| x.0 < dest_slide as usize) .filter(|x| x.0 < dest_slide as usize)
.filter(|x| { .filter(|x| x.1.service_item_id <= destination_index)
x.1.service_item_id <= destination_index .filter(|x| x.1.service_item_id > source_index)
&& x.1.service_item_id > source_index
})
{ {
if let Some(slide) = self.as_mut().slides_mut().get_mut(i) { if let Some(slide) = self.as_mut().slides_mut().get_mut(i) {
println!( println!(
@ -619,21 +617,18 @@ mod slide_model {
for (i, slide) in slides_iter for (i, slide) in slides_iter
.enumerate() .enumerate()
.filter(|x| x.0 >= (dest_slide as usize + count as usize)) .filter(|x| x.0 >= (dest_slide as usize + count as usize))
.filter(|x| x.1.service_item_id >= destination_index)
.filter(|x| x.1.service_item_id < source_index)
{ {
if slide.service_item_id >= destination_index if let Some(slide) = self.as_mut().slides_mut().get_mut(i) {
&& slide.service_item_id < source_index println!(
{ "rust-switching-service: {:?} to {:?}",
if let Some(slide) = self.as_mut().slides_mut().get_mut(i) { slide.service_item_id,
println!( slide.service_item_id + 1
"rust-switching-service: {:?} to {:?}", );
slide.service_item_id, slide.service_item_id += 1;
slide.service_item_id + 1
);
slide.service_item_id += 1;
}
println!("rust-did:");
} }
println!("rust-not-service_item_id: {:?}", slide.service_item_id); println!("rust-did:");
} }
} }