alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy lints in purple-night build.rs

Browse source
This commit is contained in:
Gwilym Kuiper 2022-02-26 21:16:59 +00:00
parent 4ee2fcf749
commit 548e88f7c4
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
examples/the-purple-night/build.rs
View file

@ -67,7 +67,7 @@ fn main() {
write!(&mut writer, "{}", output).unwrap(); write!(&mut writer, "{}", output).unwrap();
} }
fn extract_tiles<'a>(layer: &'a tiled::LayerData) -> impl Iterator<Item = u16> + 'a { fn extract_tiles(layer: &'_ tiled::LayerData) -> impl Iterator<Item = u16> + '_ {
match layer { match layer {
tiled::LayerData::Finite(tiles) => { tiled::LayerData::Finite(tiles) => {
tiles.iter().flat_map(|row| row.iter().map(|tile| tile.gid)) 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>( fn get_spawn_locations(
object_group: &'a tiled::ObjectGroup, object_group: &tiled::ObjectGroup,
enemy_type: &str, enemy_type: &str,
) -> ( ) -> (Vec<u16>, Vec<u16>) {
impl Iterator<Item = u16> + 'a,
impl Iterator<Item = u16> + 'a,
) {
let mut spawns = object_group let mut spawns = object_group
.objects .objects
.iter() .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)) .map(|object| (object.x as u16, object.y as u16))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -103,5 +100,5 @@ fn get_spawn_locations<'a>(
let xs = spawns.iter().map(|pos| pos.0).collect::<Vec<_>>(); let xs = spawns.iter().map(|pos| pos.0).collect::<Vec<_>>();
let ys = spawns.iter().map(|pos| pos.1).collect::<Vec<_>>(); let ys = spawns.iter().map(|pos| pos.1).collect::<Vec<_>>();
(xs.into_iter(), ys.into_iter()) (xs, ys)
} }