From 548e88f7c4907a1f429f136400e6c12faf637d1e Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sat, 26 Feb 2022 21:16:59 +0000 Subject: [PATCH] Fix clippy lints in purple-night build.rs --- examples/the-purple-night/build.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/the-purple-night/build.rs b/examples/the-purple-night/build.rs index c329d950..94914e8e 100644 --- a/examples/the-purple-night/build.rs +++ b/examples/the-purple-night/build.rs @@ -67,7 +67,7 @@ fn main() { write!(&mut writer, "{}", output).unwrap(); } -fn extract_tiles<'a>(layer: &'a tiled::LayerData) -> impl Iterator + 'a { +fn extract_tiles(layer: &'_ tiled::LayerData) -> impl Iterator + '_ { match layer { tiled::LayerData::Finite(tiles) => { tiles.iter().flat_map(|row| row.iter().map(|tile| tile.gid)) @@ -84,17 +84,14 @@ fn get_map_id(tileid: u32) -> u16 { } } -fn get_spawn_locations<'a>( - object_group: &'a tiled::ObjectGroup, +fn get_spawn_locations( + object_group: &tiled::ObjectGroup, enemy_type: &str, -) -> ( - impl Iterator + 'a, - impl Iterator + 'a, -) { +) -> (Vec, Vec) { let mut spawns = object_group .objects .iter() - .filter(|object| &object.obj_type == enemy_type) + .filter(|object| object.obj_type == enemy_type) .map(|object| (object.x as u16, object.y as u16)) .collect::>(); @@ -103,5 +100,5 @@ fn get_spawn_locations<'a>( let xs = spawns.iter().map(|pos| pos.0).collect::>(); let ys = spawns.iter().map(|pos| pos.1).collect::>(); - (xs.into_iter(), ys.into_iter()) + (xs, ys) }