From 9a83c0671617efe1ebcd10d3819b3afcd63e6e1c Mon Sep 17 00:00:00 2001 From: "Elijah C. Voigt" Date: Wed, 3 Jul 2024 14:35:02 -0700 Subject: [PATCH] clippy fix --- src/camera.rs | 2 +- src/editor.rs | 2 +- src/save.rs | 115 ++++++++++++++++++++++++-------------------------- 3 files changed, 58 insertions(+), 61 deletions(-) diff --git a/src/camera.rs b/src/camera.rs index 95d19af..19da81d 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -88,7 +88,7 @@ fn rotate_editor_fly_camera( mouse: Res>, mut cursor_events: EventReader, ) { - (cursor_events.len() > 0).then(|| { + (!cursor_events.is_empty()).then(|| { // Iterate over all cameras cameras.iter_mut().for_each(|(c, mut t)| { // Determine which window this camera is attached to diff --git a/src/editor.rs b/src/editor.rs index 0693850..752f815 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -163,7 +163,7 @@ fn plane_gizmos(mut gizmos: Gizmos) { let r = 20.0; let start = -r as i8; let end = r as i8; - (start..=end).into_iter().for_each(|n| { + (start..=end).for_each(|n| { { let offset = Vec3::Z * (n as f32); gizmos.line(Vec3::NEG_X * r + offset, Vec3::X * r + offset, Color::GRAY); diff --git a/src/save.rs b/src/save.rs index 5b24706..167e7ff 100644 --- a/src/save.rs +++ b/src/save.rs @@ -82,12 +82,12 @@ mod parse { tag(l)(s) } - fn parse_xyz<'a>(i: &'a str) -> IResult<&'a str, (f32, f32, f32)> { + fn parse_xyz(i: &str) -> IResult<&str, (f32, f32, f32)> { tuple((float, take(1usize), float, take(1usize), float))(i) .map(|(s, (x, _, y, _, z))| (s, (x, y, z))) } - fn parse_wxyz<'a>(i: &'a str) -> IResult<&'a str, (f32, f32, f32, f32)> { + fn parse_wxyz(i: &str) -> IResult<&str, (f32, f32, f32, f32)> { tuple(( float, take(1usize), @@ -100,7 +100,7 @@ mod parse { .map(|(s, (w, _, x, _, y, _, z))| (s, (w, x, y, z))) } - fn parse_string<'a>(i: &'a str) -> IResult<&'a str, &'a str> { + fn parse_string(i: &str) -> IResult<&str, &str> { let (rem, (_, out, _)) = tuple((tag("\""), take_until1("\""), tag("\"")))(i)?; Ok((rem, out)) } @@ -167,7 +167,7 @@ mod parse { pub(crate) fn parse_save_name(line: &str) -> Result { let (remainder, _) = tag("name")(line)?; let n = remainder.trim().to_string(); - if n.len() == 0 { + if n.is_empty() { Err(SaveEntityParseError::Name) } else { let name = Name::new(n); @@ -241,7 +241,7 @@ mod parse { pub(crate) fn parse_save_camera(line: &str) -> Result { let (_rem, cam) = tag("camera")(line)?; - Ok(cam.len() > 0) + Ok(!cam.is_empty()) } #[test] @@ -318,61 +318,58 @@ fn check_loaded_entity_assets( gltfs: Res>, ) { events.read().for_each(|event| { - match event { - AssetEvent::LoadedWithDependencies { id } => { - query - .iter() - .filter(|(_, handle)| handle.id() == *id) - .for_each(|(entity, _handle)| { - let saved = save_entities.get(*id).unwrap(); - debug!( - "Updating entity {:?} ({:?}) because asset changed", - saved.name, saved.uuid - ); - - let mut e = commands.entity(entity); - // Apply camera - // Should be applied early to avoid clobbering transform - if let Some(is_camera) = &saved.camera { - if *is_camera { - e.insert(Camera3dBundle { ..default() }); - } - } else { - e.remove::<(Camera, Camera3d)>(); + if let AssetEvent::LoadedWithDependencies { id } = event { + query + .iter() + .filter(|(_, handle)| handle.id() == *id) + .for_each(|(entity, _handle)| { + let saved = save_entities.get(*id).unwrap(); + debug!( + "Updating entity {:?} ({:?}) because asset changed", + saved.name, saved.uuid + ); + + let mut e = commands.entity(entity); + // Apply camera + // Should be applied early to avoid clobbering transform + if let Some(is_camera) = &saved.camera { + if *is_camera { + e.insert(Camera3dBundle { ..default() }); } - // Apply transform - if let Some(transform) = &saved.transform { - // TODO: Only update if different - e.insert(transform.clone()); - } else { - e.remove::(); - } - // Apply Name - if let Some(name) = &saved.name { - // TODO: Only update if different - e.insert(name.clone()); - } else { - e.remove::(); - } - // Apply Uuid - if let Some(uuid) = &saved.uuid { - // TODO: Only update if different - e.insert(uuid.clone()); - } else { - e.remove::(); - } - // Apply Model - if let Some((gltf_handle, scene_name)) = &saved.model { - // Find scene and update - let gltf = gltfs.get(gltf_handle).unwrap(); - let scene_handle = gltf.named_scenes.get(scene_name).unwrap(); - e.insert(scene_handle.clone()); - } else { - e.remove::>(); - } - }); - } - _ => (), + } else { + e.remove::<(Camera, Camera3d)>(); + } + // Apply transform + if let Some(transform) = &saved.transform { + // TODO: Only update if different + e.insert(*transform); + } else { + e.remove::(); + } + // Apply Name + if let Some(name) = &saved.name { + // TODO: Only update if different + e.insert(name.clone()); + } else { + e.remove::(); + } + // Apply Uuid + if let Some(uuid) = &saved.uuid { + // TODO: Only update if different + e.insert(uuid.clone()); + } else { + e.remove::(); + } + // Apply Model + if let Some((gltf_handle, scene_name)) = &saved.model { + // Find scene and update + let gltf = gltfs.get(gltf_handle).unwrap(); + let scene_handle = gltf.named_scenes.get(scene_name).unwrap(); + e.insert(scene_handle.clone()); + } else { + e.remove::>(); + } + }); } }) }