dont require referece to lambda

686bd887af0842e1ab6fe5b0c51db0a7988fee10 · por Emil Sjölander · 2018-12-17T23:22:28Z (hace 7 años) · padre 3d82715d0 · ver el árbol en este commit

Delta semántico · 3

src/algo.rs

cambió por dentro fn compute_internal

src/geometry.rs

cambió de firma def map
cambió de firma def map

2 archivos · +20 −14

src/algo.rs +12 −12
src/geometry.rs +8 −2

diff --git a/src/algo.rs b/src/algo.rs
index f710f2280..28b81562c 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -118,9 +118,9 @@ fn compute_internal(
     let is_column = dir.is_column();
     let is_wrap_reverse = node.flex_wrap == FlexWrap::WrapReverse;
 
-    let margin = node.margin.map(&|n| n.resolve(percent_calc_base).or_else(0.0));
-    let padding = node.padding.map(&|n| n.resolve(percent_calc_base).or_else(0.0));
-    let border = node.border.map(&|n| n.resolve(percent_calc_base).or_else(0.0));
+    let margin = node.margin.map(|n| n.resolve(percent_calc_base).or_else(0.0));
+    let padding = node.padding.map(|n| n.resolve(percent_calc_base).or_else(0.0));
+    let border = node.border.map(|n| n.resolve(percent_calc_base).or_else(0.0));
 
     let padding_border = Rect {
         start: padding.start + border.start,
@@ -162,14 +162,14 @@ fn compute_internal(
         .map(|child| FlexItem {
             node: child,
 
-            size: child.size.map(&|s| s.resolve(percent_calc_base_child)),
-            min_size: child.min_size.map(&|s| s.resolve(percent_calc_base_child)),
-            max_size: child.max_size.map(&|s| s.resolve(percent_calc_base_child)),
+            size: child.size.map(|s| s.resolve(percent_calc_base_child)),
+            min_size: child.min_size.map(|s| s.resolve(percent_calc_base_child)),
+            max_size: child.max_size.map(|s| s.resolve(percent_calc_base_child)),
 
-            position: child.position.map(&|p| p.resolve(percent_calc_base_child)),
-            margin: child.margin.map(&|m| m.resolve(percent_calc_base_child).or_else(0.0)),
-            padding: child.padding.map(&|p| p.resolve(percent_calc_base_child).or_else(0.0)),
-            border: child.border.map(&|b| b.resolve(percent_calc_base_child).or_else(0.0)),
+            position: child.position.map(|p| p.resolve(percent_calc_base_child)),
+            margin: child.margin.map(|m| m.resolve(percent_calc_base_child).or_else(0.0)),
+            padding: child.padding.map(|p| p.resolve(percent_calc_base_child).or_else(0.0)),
+            border: child.border.map(|b| b.resolve(percent_calc_base_child).or_else(0.0)),
 
             flex_basis: 0.0,
             inner_flex_basis: 0.0,
@@ -1007,8 +1007,8 @@ fn compute_internal(
             let layout_item = |child: &mut FlexItem| {
                 let result = compute_internal(
                     child.node,
-                    child.target_size.map(&|s| s.to_number()),
-                    container_size.map(&|s| s.to_number()),
+                    child.target_size.map(|s| s.to_number()),
+                    container_size.map(|s| s.to_number()),
                     percent_calc_base_child,
                 );
 
diff --git a/src/geometry.rs b/src/geometry.rs
index 142606b9c..0e3bd6901 100644
--- a/src/geometry.rs
+++ b/src/geometry.rs
@@ -11,7 +11,10 @@ pub struct Rect<T> {
 }
 
 impl<T> Rect<T> {
-    pub(crate) fn map<R>(self, f: &(Fn(T) -> R)) -> Rect<R> {
+    pub(crate) fn map<R, F>(self, f: F) -> Rect<R>
+    where
+        F: Fn(T) -> R,
+    {
         Rect { start: f(self.start), end: f(self.end), top: f(self.top), bottom: f(self.bottom) }
     }
 }
@@ -83,7 +86,10 @@ pub struct Size<T> {
 }
 
 impl<T> Size<T> {
-    pub(crate) fn map<R>(self, f: &(Fn(T) -> R)) -> Size<R> {
+    pub(crate) fn map<R, F>(self, f: F) -> Size<R>
+    where
+        F: Fn(T) -> R,
+    {
         Size { width: f(self.width), height: f(self.height) }
     }