gioser

tawasuyu/taffy

A high performance rust-powered UI layout library

HTML 231Rust 10TOML 3CSS 1348 Sutichaykuna

run and fix clippy lints

0d73dba988f8686846dc60ad4c12afa43dbd8ed0 · ruwaq Emil Sjölander · (7 wata ñawpaq) · tayta b9d9df70e · kay commitpi sach'ata qhaway

Semántico sayk'uy · 5

src/algo.rs

src/style.rs

  • silq'uyninpi t'ikrakurqan def resolve

2 qillqakuna · +12 −10

diff --git a/src/algo.rs b/src/algo.rs
index 59c8e1f24..b385d569e 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 use std::f32;
 
 use crate::layout;
@@ -16,14 +18,14 @@ struct FlexSize {
 }
 
 impl FlexSize {
-    fn main(&self, direction: style::FlexDirection) -> f32 {
+    fn main(self, direction: style::FlexDirection) -> f32 {
         match direction {
             style::FlexDirection::Row | style::FlexDirection::RowReverse => self.width,
             style::FlexDirection::Column | style::FlexDirection::ColumnReverse => self.height,
         }
     }
 
-    fn cross(&self, direction: style::FlexDirection) -> f32 {
+    fn cross(self, direction: style::FlexDirection) -> f32 {
         match direction {
             style::FlexDirection::Row | style::FlexDirection::RowReverse => self.height,
             style::FlexDirection::Column | style::FlexDirection::ColumnReverse => self.width,
@@ -465,7 +467,7 @@ fn compute_internal(
                 line_length += child.hypothetical_outer_main_size;
 
                 if let Defined(main) = available_main {
-                    if line_length > main && line.items.len() > 0 {
+                    if line_length > main && !line.items.is_empty() {
                         line_length = child.hypothetical_outer_main_size;
                         lines.push(line);
                         line = FlexLine { items: vec![], cross_size: 0.0, offset_cross: 0.0 };
@@ -569,7 +571,7 @@ fn compute_internal(
                 }
             });
 
-            if unfrozen.len() == 0 {
+            if unfrozen.is_empty() {
                 break;
             }
 
@@ -739,10 +741,10 @@ fn compute_internal(
     // TODO - This is expensive and should only be done if we really require a baseline. aka, make it lazy
 
     fn calc_baseline(layout: &layout::Node) -> f32 {
-        if layout.children.len() > 0 {
-            calc_baseline(&layout.children[0])
-        } else {
+        if layout.children.is_empty() {
             layout.height
+        } else {
+            calc_baseline(&layout.children[0])
         }
     };
 
diff --git a/src/style.rs b/src/style.rs
index de06eb6d0..752c6e810 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -168,10 +168,10 @@ impl Default for Dimension {
 }
 
 impl Dimension {
-    pub(crate) fn resolve(&self, parent_width: Number) -> Number {
+    pub(crate) fn resolve(self, parent_width: Number) -> Number {
         match self {
-            Dimension::Points(points) => Number::Defined(*points),
-            Dimension::Percent(percent) => parent_width * *percent,
+            Dimension::Points(points) => Number::Defined(points),
+            Dimension::Percent(percent) => parent_width * percent,
             _ => Number::Undefined,
         }
     }