Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tygyh/Resolve-all-'#-allow(clippy--neg_multiply)]'-error-supressions' into 'master'

Browse Source 
Resolve all '#[allow(clippy::neg_multiply)]' error supressions

See merge request veloren/veloren!2603
This commit is contained in:
Marcel 2021-07-14 22:02:48 +00:00
commit 44a840a70a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/figure/mod.rs
View File

@ -119,7 +119,6 @@ impl<V: Vox + Copy> DynaUnionizer<V> {
} }
} }
#[allow(clippy::neg_multiply)] // TODO: Pending review in #587
pub fn unify(self) -> (Dyna<V, ()>, Vec3<i32>) { pub fn unify(self) -> (Dyna<V, ()>, Vec3<i32>) {
if self.0.is_empty() { if self.0.is_empty() {
return (Dyna::filled(Vec3::zero(), V::empty(), ()), Vec3::zero()); return (Dyna::filled(Vec3::zero(), V::empty(), ()), Vec3::zero());
@ -137,7 +136,7 @@ impl<V: Vox + Copy> DynaUnionizer<V> {
// Allocate new segment // Allocate new segment
let mut combined = Dyna::filled(new_size, V::empty(), ()); let mut combined = Dyna::filled(new_size, V::empty(), ());
// Copy segments into combined // Copy segments into combined
let origin = min_point.map(|e| e * -1); let origin = min_point.map(|e| -e);
for (dyna, offset) in self.0 { for (dyna, offset) in self.0 {
for (pos, vox) in dyna.full_vol_iter() { for (pos, vox) in dyna.full_vol_iter() {
if !vox.is_empty() { if !vox.is_empty() {