Merge pull request #104 from nathanaelneveux/fix-rust-1-95-clippy

minimal changes for clippy

Author: splashdust

Cargo.toml

@@ -28,7 +28,6 @@ path = "examples/noise_terrain.rs"
 [[example]]
 name = "noise_terrain_lod"
 path = "examples/noise_terrain_lod.rs"
-required-features = ["noise"]
 
 [[example]]
 name = "custom_meshing"

examples/custom_meshing.rs

@@ -97,7 +97,7 @@ impl VoxelWorldConfig for MainWorld {
                     let mut tex_coords = Vec::with_capacity(num_vertices);
                     let mut material_types = Vec::with_capacity(num_vertices);
 
-                    for (group, face) in buffer.quads.groups.into_iter().zip(faces.into_iter()) {
+                    for (group, face) in buffer.quads.groups.into_iter().zip(faces) {
                         for quad in group.into_iter() {
                             let _normal = IVec3::from([
                                 face.signed_normal().x,

examples/multiple_noise_terrain.rs

@@ -90,6 +90,7 @@ fn setup(mut commands: Commands) {
     });
 }
 
+#[allow(clippy::type_complexity)]
 fn get_voxel_fn() -> Box<
     dyn FnMut(IVec3, Option<WorldVoxel<BlockTexture>>) -> WorldVoxel<BlockTexture>
         + Send

examples/noise_terrain_lod.rs

@@ -202,7 +202,7 @@ fn setup(mut commands: Commands, mut fonts: ResMut<Assets<Font>>) {
     ));
 
     // Ambient light, same color as sun
-    commands.insert_resource(AmbientLight {
+    commands.insert_resource(GlobalAmbientLight {
         color: Color::srgb(0.98, 0.95, 0.82),
         brightness: 100.0,
         affects_lightmapped_meshes: true,

src/meshing.rs

@@ -114,7 +114,7 @@ fn mesh_from_quads_for_shape<I: PartialEq + Copy>(
 
     let voxel_size = voxel_size_from_shape(shape);
 
-    for (group, face) in quads.groups.into_iter().zip(faces.into_iter()) {
+    for (group, face) in quads.groups.into_iter().zip(faces) {
         for quad in group.into_iter() {
             let quad = Into::<block_mesh::geometry::UnorientedQuad>::into(quad);
             let normal = IVec3::from([

src/voxel_world_internal.rs

@@ -411,17 +411,13 @@ where
     ) {
         let thread_pool = AsyncComputeTaskPool::get();
         let max_threads = configuration.max_active_chunk_threads();
-        let mut active_threads = chunk_threads.iter().count();
+        let remaining_threads = max_threads.saturating_sub(chunk_threads.iter().count());
 
-        if max_threads == 0 {
+        if remaining_threads == 0 {
             return;
         }
 
-        for chunk in dirty_chunks.iter() {
-            if active_threads >= max_threads {
-                break;
-            }
-
+        for chunk in dirty_chunks.iter().take(remaining_threads) {
             let previous_chunk_data = {
                 let read_lock = chunk_map.get_read_lock();
                 ChunkMap::<C, C::MaterialIndex>::get(&chunk.position, &read_lock)
@@ -492,8 +488,6 @@ where
                 ))
                 .remove::<NeedsRemesh>();
 
-            active_threads += 1;
-
             ev_chunk_will_remesh
                 .write(ChunkWillRemesh::<C>::new(chunk.position, chunk.entity));
         }