using filter iterator functions instead of if else blocks

This commit is contained in:
Chris Cochrun 2023-04-13 09:19:49 -05:00
parent ade09bb4e8
commit 9da9859411

View file

@ -600,21 +600,20 @@ 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| {
x.1.service_item_id <= destination_index
&& 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:");
} }
} else { } else {
for (i, slide) in slides_iter for (i, slide) in slides_iter