diff -r 95360f56db38 -r a65b60f36b96 rust/landgen/src/outline.rs --- a/rust/landgen/src/outline.rs Mon Nov 05 19:56:28 2018 +0300 +++ b/rust/landgen/src/outline.rs Mon Nov 05 20:22:09 2018 +0300 @@ -54,11 +54,11 @@ .chain(self.fill_points.iter()) } - pub fn iter_mut(&mut self) -> impl Iterator { - self.islands - .iter_mut() - .flat_map(|i| i.iter_mut()) - .chain(self.fill_points.iter_mut()) + pub fn for_each(&mut self, f: F) + where F: (Fn(&mut Point)) + { + self.islands.iter_mut().for_each(|p| p.for_each(|x| f(x))); + self.fill_points.iter_mut().for_each(|p| f(p)); } fn divide_edge>( @@ -289,14 +289,12 @@ pub fn mirror(&mut self) { let r = self.size.width as i32 - 1; - - self.iter_mut().for_each(|p| p.x = r - p.x); + self.for_each(|p| p.x = r - p.x); } pub fn flip(&mut self) { let t = self.size.height as i32 - 1; - - self.iter_mut().for_each(|p| p.y = t - p.y); + self.for_each(|p| p.y = t - p.y); } } @@ -323,7 +321,7 @@ Some(&Line::new(Point::new(20, 15), Point::new(10, 15))) ); - points.iter_mut().for_each(|p| p.x = 2); + points.for_each(|p| p.x = 2); assert_eq!(points.fill_points[0].x, 2); assert_eq!(points.islands[0].get_edge(0).start.x, 2);