gioser

tawasuyu/taffy

A high performance rust-powered UI layout library

Rust 497HTML 254C 19JavaScript 81329 Definiciones

Fix yoga benchmarks (#436)

5e63f994cf121ecdad9e32f900afaeee8cabc651 · por Nico Burns · (hace 3 años) · padre a99dc54ca · ver el árbol en este commit

Delta semántico · 3

benches/flexbox.rs

2 archivos · +7 −7

diff --git a/Cargo.toml b/Cargo.toml
index 855eef245..82ef5b708 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ slotmap = "1.0.6"
 grid = { version = "0.9.0", optional = true }
 
 [features]
-default = ["std", "flexbox", "grid" ]
+default = ["std", "flexbox", "grid"]
 flexbox = []
 grid = ["alloc", "dep:grid"]
 alloc = []
diff --git a/benches/flexbox.rs b/benches/flexbox.rs
index 3fc12ea23..d632c77cd 100644
--- a/benches/flexbox.rs
+++ b/benches/flexbox.rs
@@ -52,7 +52,7 @@ fn build_yoga_flat_hierarchy(total_node_count: u32) -> (yg::YogaTree, yg::NodeId
 
     while node_count < total_node_count {
         let sub_children_count = rng.gen_range(1..=4);
-        let sub_children: Vec<Node> = (0..sub_children_count)
+        let sub_children: Vec<yg::NodeId> = (0..sub_children_count)
             .map(|_| yoga_helpers::new_with_children(&mut tree, &Style::random(&mut rng), vec![]))
             .collect();
         let node = yoga_helpers::new_with_children(&mut tree, &Style::random(&mut rng), sub_children);
@@ -81,12 +81,12 @@ fn build_taffy_deep_hierarchy(node_count: u32, branching_factor: u32) -> (Taffy,
 
 #[cfg(feature = "yoga_benchmark")]
 /// A tree with a higher depth for a more realistic scenario
-fn build_yoga_deep_hierarchy(node_count: u32, branching_factor: u32) -> (yg::YogaTree, Node) {
+fn build_yoga_deep_hierarchy(node_count: u32, branching_factor: u32) -> (yg::YogaTree, yg::NodeId) {
     let mut rng = ChaCha8Rng::seed_from_u64(12345);
     let mut build_leaf_node =
         |tree: &mut yg::YogaTree| yoga_helpers::new_with_children(tree, &Style::random(&mut rng), vec![]);
     let mut rng = ChaCha8Rng::seed_from_u64(12345);
-    let mut build_flex_node = |tree: &mut yg::YogaTree, children: Vec<Node>| {
+    let mut build_flex_node = |tree: &mut yg::YogaTree, children: Vec<yg::NodeId>| {
         yoga_helpers::new_with_children(tree, &Style::random(&mut rng), children)
     };
 
@@ -116,18 +116,18 @@ fn build_taffy_huge_nested_hierarchy(node_count: u32, branching_factor: u32) ->
 
 #[cfg(feature = "yoga_benchmark")]
 /// A deep tree that matches the shape and styling that yoga use on their benchmarks
-fn build_yoga_huge_nested_hierarchy(node_count: u32, branching_factor: u32) -> (yg::YogaTree, Node) {
+fn build_yoga_huge_nested_hierarchy(node_count: u32, branching_factor: u32) -> (yg::YogaTree, yg::NodeId) {
     let style = Style {
         size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) },
         flex_grow: 1.0,
         ..Default::default()
     };
-    let mut build_leaf_node = |tree: &mut yg::YogaTree| -> Node {
+    let mut build_leaf_node = |tree: &mut yg::YogaTree| -> yg::NodeId {
         let mut node = yg::Node::new();
         yoga_helpers::apply_taffy_style(&mut node, &style.clone());
         tree.insert(node)
     };
-    let mut build_flex_node = |tree: &mut yg::YogaTree, children: Vec<Node>| -> Node {
+    let mut build_flex_node = |tree: &mut yg::YogaTree, children: Vec<yg::NodeId>| -> yg::NodeId {
         let mut node = yg::Node::new();
         yoga_helpers::apply_taffy_style(&mut node, &style.clone());
         for (i, child) in children.into_iter().enumerate() {