From 5c2fbf995a3790ce9cc830caf9e0f91f2756e766 Mon Sep 17 00:00:00 2001 From: Matthew Gordon Date: Sat, 15 Aug 2020 00:06:06 -0400 Subject: [PATCH] Made some minor improvements suggested by clippy --- src/main.rs | 2 +- src/raycasting/bounding_volume_hierarchy.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 1e17276..52bd34f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -64,7 +64,7 @@ fn parse_args() -> CommandLineParameters { let mut size_iter = matches.values_of("size").unwrap(); let width = size_iter.next().unwrap().parse().unwrap(); let height = size_iter.next().unwrap().parse().unwrap(); - let output_file = matches.value_of_os("output_png").map(|f| PathBuf::from(f)); + let output_file = matches.value_of_os("output_png").map(PathBuf::from); let time = matches.value_of("time").unwrap().parse().unwrap(); CommandLineParameters { width, diff --git a/src/raycasting/bounding_volume_hierarchy.rs b/src/raycasting/bounding_volume_hierarchy.rs index f97f3cd..6015282 100644 --- a/src/raycasting/bounding_volume_hierarchy.rs +++ b/src/raycasting/bounding_volume_hierarchy.rs @@ -61,7 +61,7 @@ impl BoundingVolumeHierarchy { .iter() .fold(BoundingBox::empty(), |acc, p| acc.union(&p.bounding_box())); if primitives.len() <= 1 { - let primitives = primitives.iter().cloned().collect(); + let primitives = primitives.to_vec(); BoundingVolumeHierarchy::Leaf { bounds, primitives } } else { let pivot = heuristic_split(primitives, &bounds); @@ -116,7 +116,7 @@ impl Intersect for BoundingVolumeHierarchy { primitives .iter() .map(|elem| elem.intersect(&ray)) - .fold(None, |acc, elem| closest_intersection(acc, elem)) + .fold(None, closest_intersection) } else { None }