Resolve all '#[allow(clippy::identity_op)]' error supressions

common/src/figure/mod.rs

@@ -187,7 +187,6 @@ impl MatSegment {
         })
     }
 
-    #[allow(clippy::identity_op)]
     pub fn from_vox(dot_vox_data: &DotVoxData, flipped: bool) -> Self {
         if let Some(model) = dot_vox_data.models.get(0) {
             let palette = dot_vox_data

voxygen/src/render/pipelines/fluid.rs

@@ -23,8 +23,7 @@ impl Vertex {
         const EXTRA_NEG_Z: f32 = 65536.0;
 
         Self {
-            pos_norm: 0
-                | ((pos.x as u32) & 0x003F) << 0
+            pos_norm: ((pos.x as u32) & 0x003F)
                 | ((pos.y as u32) & 0x003F) << 6
                 | (((pos.z + EXTRA_NEG_Z).max(0.0).min((1 << 17) as f32) as u32) & 0x1FFFF) << 12
                 | (norm_bits & 0x7) << 29,

voxygen/src/render/pipelines/terrain.rs

@@ -11,7 +11,6 @@ pub struct Vertex {
 }
 
 impl Vertex {
-    #[allow(clippy::identity_op)] // TODO: Pending review in #587
     /// NOTE: meta is true when the terrain vertex is touching water.
     pub fn new(atlas_pos: Vec2<u16>, pos: Vec3<f32>, norm: Vec3<f32>, meta: bool) -> Self {
         const EXTRA_NEG_Z: f32 = 32768.0;
@@ -26,12 +25,12 @@ impl Vertex {
             5
         };
         Self {
-            pos_norm: ((pos.x as u32) & 0x003F) << 0
+            pos_norm: ((pos.x as u32) & 0x003F)
                 | ((pos.y as u32) & 0x003F) << 6
                 | (((pos + EXTRA_NEG_Z).z.max(0.0).min((1 << 16) as f32) as u32) & 0xFFFF) << 12
                 | if meta { 1 } else { 0 } << 28
                 | (norm_bits & 0x7) << 29,
-            atlas_pos: ((atlas_pos.x as u32) & 0xFFFF) << 0 | ((atlas_pos.y as u32) & 0xFFFF) << 16,
+            atlas_pos: ((atlas_pos.x as u32) & 0xFFFF) | ((atlas_pos.y as u32) & 0xFFFF) << 16,
         }
     }
 
@@ -97,7 +96,6 @@ impl Vertex {
         ]
     }
 
-    #[allow(clippy::identity_op)]
     pub fn make_col_light_figure(
         // 0 to 31
         light: u8,
@@ -105,7 +103,7 @@ impl Vertex {
         shiny: bool,
         col: Rgb<u8>,
     ) -> [u8; 4] {
-        let attr = 0 | ((glowy as u8) << 0) | ((shiny as u8) << 1);
+        let attr = (glowy as u8) | ((shiny as u8) << 1);
         [
             (light.min(31) << 3) | ((col.r >> 1) & 0b111),
             (attr.min(31) << 3) | ((col.b >> 1) & 0b111),

world/src/block/mod.rs

@@ -168,8 +168,7 @@ impl<'a> BlockGen<'a> {
         .or_else(|| {
             // Rocks
             if (height + 2.5 - wposf.z as f32).div(7.5).abs().powi(2) < rock {
-                #[allow(clippy::identity_op)]
-                let field0 = RandomField::new(world.seed + 0);
+                let field0 = RandomField::new(world.seed);
                 let field1 = RandomField::new(world.seed + 1);
                 let field2 = RandomField::new(world.seed + 2);
 

world/src/index.rs

@@ -128,10 +128,9 @@ pub struct Noise {
 }
 
 impl Noise {
-    #[allow(clippy::identity_op)]
     fn new(seed: u32) -> Self {
         Self {
-            cave_nz: SuperSimplex::new().set_seed(seed + 0),
+            cave_nz: SuperSimplex::new().set_seed(seed),
             scatter_nz: SuperSimplex::new().set_seed(seed + 1),
         }
     }

world/src/site/settlement/mod.rs

@@ -561,7 +561,6 @@ impl Settlement {
         }
     }
 
-    #[allow(clippy::identity_op)] // TODO: Pending review in #587
     #[allow(clippy::modulo_one)] // TODO: Pending review in #587
     pub fn apply_to<'a>(
         &'a self,
@@ -680,7 +679,7 @@ impl Settlement {
                             let in_furrow = (wpos2d * furrow_dir).sum().rem_euclid(5) < 2;
 
                             let dirt = Rgb::<u8>::from(colors.plot_field_dirt).map(|e| {
-                                e + (self.noise.get(Vec3::broadcast((seed % 4096 + 0) as i32)) % 32)
+                                e + (self.noise.get(Vec3::broadcast((seed % 4096) as i32)) % 32)
                                     as u8
                             });
                             let mound = Rgb::<u8>::from(colors.plot_field_mound)

world/src/site2/plot/castle.rs

@@ -42,7 +42,6 @@ impl Castle {
 }
 
 impl Structure for Castle {
-    #[allow(clippy::identity_op)]
     fn render<F: FnMut(Primitive) -> Id<Primitive>, G: FnMut(Id<Primitive>, Fill)>(
         &self,
         site: &Site,
@@ -127,7 +126,7 @@ impl Structure for Castle {
                                     .with_z(self.alt + wall_height / 4 + 12),
                             }));
                             let window_bottom = prim(Primitive::Aabb(Aabb {
-                                min: (wpos + 1 * dir).with_z(self.alt + wall_height / 4),
+                                min: (wpos + dir).with_z(self.alt + wall_height / 4),
                                 max: (wpos + (ts - 1) * dir + dir.yx())
                                     .with_z(self.alt + wall_height / 4 + 9),
                             }));
@@ -138,7 +137,7 @@ impl Structure for Castle {
                                     .with_z(self.alt + wall_height / 4 + 12),
                             }));
                             let window_bottom2 = prim(Primitive::Aabb(Aabb {
-                                min: (wpos + 1 * dir + (ts - 1) * dir.yx())
+                                min: (wpos + dir + (ts - 1) * dir.yx())
                                     .with_z(self.alt + wall_height / 4),
                                 max: (wpos + (ts - 1) * dir + ts * dir.yx())
                                     .with_z(self.alt + wall_height / 4 + 9),

world/src/util/structure.rs

@@ -13,12 +13,11 @@ pub struct StructureGen2d {
 pub type StructureField = (Vec2<i32>, u32);
 
 impl StructureGen2d {
-    #[allow(clippy::identity_op)] // TODO: Pending review in #587
     pub fn new(seed: u32, freq: u32, spread: u32) -> Self {
         Self {
             freq,
             spread,
-            x_field: RandomField::new(seed + 0),
+            x_field: RandomField::new(seed),
             y_field: RandomField::new(seed + 1),
             seed_field: RandomField::new(seed + 2),
         }