clippy fix

attempt/001
Elijah C. Voigt 1 year ago
parent a54255c363
commit 9a83c06716

@ -88,7 +88,7 @@ fn rotate_editor_fly_camera(
mouse: Res<ButtonInput<MouseButton>>, mouse: Res<ButtonInput<MouseButton>>,
mut cursor_events: EventReader<CursorMoved>, mut cursor_events: EventReader<CursorMoved>,
) { ) {
(cursor_events.len() > 0).then(|| { (!cursor_events.is_empty()).then(|| {
// Iterate over all cameras // Iterate over all cameras
cameras.iter_mut().for_each(|(c, mut t)| { cameras.iter_mut().for_each(|(c, mut t)| {
// Determine which window this camera is attached to // Determine which window this camera is attached to

@ -163,7 +163,7 @@ fn plane_gizmos(mut gizmos: Gizmos) {
let r = 20.0; let r = 20.0;
let start = -r as i8; let start = -r as i8;
let end = 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); let offset = Vec3::Z * (n as f32);
gizmos.line(Vec3::NEG_X * r + offset, Vec3::X * r + offset, Color::GRAY); gizmos.line(Vec3::NEG_X * r + offset, Vec3::X * r + offset, Color::GRAY);

@ -82,12 +82,12 @@ mod parse {
tag(l)(s) 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) tuple((float, take(1usize), float, take(1usize), float))(i)
.map(|(s, (x, _, y, _, z))| (s, (x, y, z))) .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(( tuple((
float, float,
take(1usize), take(1usize),
@ -100,7 +100,7 @@ mod parse {
.map(|(s, (w, _, x, _, y, _, z))| (s, (w, x, y, z))) .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)?; let (rem, (_, out, _)) = tuple((tag("\""), take_until1("\""), tag("\"")))(i)?;
Ok((rem, out)) Ok((rem, out))
} }
@ -167,7 +167,7 @@ mod parse {
pub(crate) fn parse_save_name(line: &str) -> Result<Name, SaveEntityParseError> { pub(crate) fn parse_save_name(line: &str) -> Result<Name, SaveEntityParseError> {
let (remainder, _) = tag("name")(line)?; let (remainder, _) = tag("name")(line)?;
let n = remainder.trim().to_string(); let n = remainder.trim().to_string();
if n.len() == 0 { if n.is_empty() {
Err(SaveEntityParseError::Name) Err(SaveEntityParseError::Name)
} else { } else {
let name = Name::new(n); let name = Name::new(n);
@ -241,7 +241,7 @@ mod parse {
pub(crate) fn parse_save_camera(line: &str) -> Result<bool, SaveEntityParseError> { pub(crate) fn parse_save_camera(line: &str) -> Result<bool, SaveEntityParseError> {
let (_rem, cam) = tag("camera")(line)?; let (_rem, cam) = tag("camera")(line)?;
Ok(cam.len() > 0) Ok(!cam.is_empty())
} }
#[test] #[test]
@ -318,8 +318,7 @@ fn check_loaded_entity_assets(
gltfs: Res<Assets<Gltf>>, gltfs: Res<Assets<Gltf>>,
) { ) {
events.read().for_each(|event| { events.read().for_each(|event| {
match event { if let AssetEvent::LoadedWithDependencies { id } = event {
AssetEvent::LoadedWithDependencies { id } => {
query query
.iter() .iter()
.filter(|(_, handle)| handle.id() == *id) .filter(|(_, handle)| handle.id() == *id)
@ -343,7 +342,7 @@ fn check_loaded_entity_assets(
// Apply transform // Apply transform
if let Some(transform) = &saved.transform { if let Some(transform) = &saved.transform {
// TODO: Only update if different // TODO: Only update if different
e.insert(transform.clone()); e.insert(*transform);
} else { } else {
e.remove::<Transform>(); e.remove::<Transform>();
} }
@ -372,7 +371,5 @@ fn check_loaded_entity_assets(
} }
}); });
} }
_ => (),
}
}) })
} }

Loading…
Cancel
Save