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--int_plus_one)]'-error-supressions' into 'master'

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

See merge request veloren/veloren!2606
This commit is contained in:
Marcel 2021-07-15 13:35:28 +00:00
commit ad2cf88e33
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/src/site/settlement/building/archetype/house.rs
View File

@ -245,7 +245,6 @@ impl Archetype for House {
} }
#[allow(clippy::if_same_then_else)] // TODO: Pending review in #587 #[allow(clippy::if_same_then_else)] // TODO: Pending review in #587
#[allow(clippy::int_plus_one)] // TODO: Pending review in #587
fn draw( fn draw(
&self, &self,
index: IndexRef, index: IndexRef,
@ -335,9 +334,7 @@ impl Archetype for House {
if let Pillar::Chimney(chimney_height) = attr.pillar { if let Pillar::Chimney(chimney_height) = attr.pillar {
let chimney_top = roof_top + chimney_height; let chimney_top = roof_top + chimney_height;
// Chimney shaft // Chimney shaft
if center_offset.map(|e| e.abs()).reduce_max() == 0 if center_offset.map(|e| e.abs()).reduce_max() == 0 && profile.y > foundation_height {
&& profile.y >= foundation_height + 1
{
return if profile.y == foundation_height + 1 { return if profile.y == foundation_height + 1 {
fire fire
} else { } else {