Minor: In a few tests simplified default Style construction (#495)
'Style::default()' instead of 'Style::{ ..Default::default() }'
cf90bc5b79228137deafa45cbe75c4b523c24846 · por Yurii Nakonechnyi · (hace 3 años) · padre d338f3731 · ver el árbol en este commit
Delta semántico · 12
tests/root_constraints.rs
diff --git a/tests/caching.rs b/tests/caching.rs
index bdc41c34b..0ef57c36b 100644
--- a/tests/caching.rs
+++ b/tests/caching.rs
@@ -12,7 +12,7 @@ mod caching {
let leaf = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| {
NUM_MEASURES.fetch_add(1, Ordering::SeqCst);
Size {
diff --git a/tests/measure.rs b/tests/measure.rs
index 68de44eba..5948387d0 100644
--- a/tests/measure.rs
+++ b/tests/measure.rs
@@ -8,7 +8,7 @@ mod measure {
let mut taffy = Taffy::new();
let node = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(100.0),
height: known_dimensions.height.unwrap_or(100.0),
@@ -28,7 +28,7 @@ mod measure {
let child = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(100.0),
height: known_dimensions.height.unwrap_or(100.0),
@@ -36,7 +36,7 @@ mod measure {
)
.unwrap();
- let node = taffy.new_with_children(Style { ..Default::default() }, &[child]).unwrap();
+ let node = taffy.new_with_children(Style::default(), &[child]).unwrap();
taffy.compute_layout(node, Size::MAX_CONTENT).unwrap();
assert_eq!(taffy.layout(node).unwrap().size.width, 100.0);
@@ -51,7 +51,7 @@ mod measure {
let mut taffy = Taffy::new();
let child = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(100.0),
height: known_dimensions.height.unwrap_or(100.0),
@@ -81,7 +81,7 @@ mod measure {
let mut taffy = Taffy::new();
let child = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(100.0),
height: known_dimensions.height.unwrap_or(100.0),
@@ -163,7 +163,7 @@ mod measure {
let child1 = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(100.0),
height: known_dimensions.height.unwrap_or(50.0),
@@ -236,7 +236,7 @@ mod measure {
let child1 = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| {
let width = known_dimensions.width.unwrap_or(100.0);
let height = known_dimensions.height.unwrap_or(width * 2.0);
@@ -268,7 +268,7 @@ mod measure {
let child = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| {
let height = known_dimensions.height.unwrap_or(50.0);
let width = known_dimensions.width.unwrap_or(height);
@@ -306,7 +306,7 @@ mod measure {
)
.unwrap();
- let node = taffy.new_with_children(Style { ..Default::default() }, &[child]).unwrap();
+ let node = taffy.new_with_children(Style::default(), &[child]).unwrap();
taffy.compute_layout(node, Size::MAX_CONTENT).unwrap();
assert_eq!(taffy.layout(child).unwrap().size.width, 50.0);
@@ -326,7 +326,7 @@ mod measure {
)
.unwrap();
- let node = taffy.new_with_children(Style { ..Default::default() }, &[child]).unwrap();
+ let node = taffy.new_with_children(Style::default(), &[child]).unwrap();
taffy.compute_layout(node, Size::MAX_CONTENT).unwrap();
assert_eq!(taffy.layout(child).unwrap().size.width, 100.0);
@@ -373,7 +373,7 @@ mod measure {
let mut taffy = Taffy::new();
let child = taffy
.new_leaf_with_measure(
- Style { ..Default::default() },
+ Style::default(),
MeasureFunc::Raw(|known_dimensions, _available_space| Size {
width: known_dimensions.width.unwrap_or(50.0),
height: known_dimensions.height.unwrap_or(50.0),
diff --git a/tests/root_constraints.rs b/tests/root_constraints.rs
index 67fdf7b4c..9791fd28b 100644
--- a/tests/root_constraints.rs
+++ b/tests/root_constraints.rs
@@ -33,7 +33,7 @@ mod root_constraints {
#[test]
fn root_with_no_size() {
let mut taffy = taffy::Taffy::new();
- let node = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap();
+ let node = taffy.new_leaf(taffy::style::Style::default()).unwrap();
taffy
.compute_layout(