From d9dd49552b4370c94811d359c101837e3ec1ed54 Mon Sep 17 00:00:00 2001 From: Jonathan Berglin Date: Mon, 29 Nov 2021 09:32:55 +0000 Subject: [PATCH] Tygyh/resolve all '# allow(clippy needless update)]' error supressions --- server/src/lib.rs | 2 -- voxygen/benches/meshing_benchmark.rs | 2 -- world/examples/water.rs | 6 ++---- world/src/site/castle/mod.rs | 1 - world/src/site/settlement/mod.rs | 1 - world/src/site2/plot/dungeon.rs | 1 - 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/server/src/lib.rs b/server/src/lib.rs index 4054577923..f18b62e892 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -201,7 +201,6 @@ pub struct Server { impl Server { /// Create a new `Server` - #[allow(clippy::needless_update)] // TODO: Pending review in #587 pub fn new( settings: Settings, editable_settings: EditableSettings, @@ -356,7 +355,6 @@ impl Server { // Load default map from assets. FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()) }, - ..WorldOpts::default() }, state.thread_pool(), ); diff --git a/voxygen/benches/meshing_benchmark.rs b/voxygen/benches/meshing_benchmark.rs index a1e7e3a9c5..9ebff52ec2 100644 --- a/voxygen/benches/meshing_benchmark.rs +++ b/voxygen/benches/meshing_benchmark.rs @@ -11,7 +11,6 @@ use world::{sim, World}; const CENTER: Vec2 = Vec2 { x: 512, y: 512 }; const GEN_SIZE: i32 = 4; -#[allow(clippy::needless_update)] // TODO: Pending review in #587 pub fn criterion_benchmark(c: &mut Criterion) { let pool = rayon::ThreadPoolBuilder::new().build().unwrap(); // Generate chunks here to test @@ -24,7 +23,6 @@ pub fn criterion_benchmark(c: &mut Criterion) { // directly with a closure. seed_elements: true, world_file: sim::FileOpts::LoadAsset(sim::DEFAULT_WORLD_MAP.into()), - ..Default::default() }, &pool, ); diff --git a/world/examples/water.rs b/world/examples/water.rs index 2218678456..c25451bf90 100644 --- a/world/examples/water.rs +++ b/world/examples/water.rs @@ -23,7 +23,6 @@ use veloren_world::{ const W: usize = 1024; const H: usize = 1024; -#[allow(clippy::needless_update)] // TODO: Pending review in #587 fn main() { FmtSubscriber::builder() .with_max_level(Level::ERROR) @@ -48,9 +47,8 @@ fn main() { WorldOpts { seed_elements: false, world_file: sim::FileOpts::LoadAsset(veloren_world::sim::DEFAULT_WORLD_MAP.into()), - // world_file: sim::FileOpts::Load(_map_file), - // world_file: sim::FileOpts::Save(sim::SizeOpts::default()), - ..WorldOpts::default() + /* world_file: sim::FileOpts::Load(_map_file), + * world_file: sim::FileOpts::Save(sim::SizeOpts::default()), */ }, &threadpool, ); diff --git a/world/src/site/castle/mod.rs b/world/src/site/castle/mod.rs index 8f90faeadf..80172055b3 100644 --- a/world/src/site/castle/mod.rs +++ b/world/src/site/castle/mod.rs @@ -178,7 +178,6 @@ impl Castle { pub fn radius(&self) -> f32 { 200.0 } - #[allow(clippy::needless_update)] // TODO: Pending review in #587 pub fn spawn_rules(&self, wpos: Vec2) -> SpawnRules { SpawnRules { trees: wpos.distance_squared(self.origin) > self.radius.pow(2), diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 9c568b6c50..309bd140ad 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -548,7 +548,6 @@ impl Settlement { pub fn radius(&self) -> f32 { 400.0 } - #[allow(clippy::needless_update)] // TODO: Pending review in #587 pub fn spawn_rules(&self, wpos: Vec2) -> SpawnRules { SpawnRules { trees: self diff --git a/world/src/site2/plot/dungeon.rs b/world/src/site2/plot/dungeon.rs index 8da77c1760..055dc4387a 100644 --- a/world/src/site2/plot/dungeon.rs +++ b/world/src/site2/plot/dungeon.rs @@ -119,7 +119,6 @@ impl Dungeon { .unwrap_or(200.0) } - #[allow(clippy::needless_update)] // TODO: Pending review in #587 pub fn spawn_rules(&self, wpos: Vec2) -> SpawnRules { SpawnRules { trees: wpos.distance_squared(self.origin) > 64i32.pow(2),