tawasuyu

tawasuyu/taffy

A high performance rust-powered UI layout library

Rust 1116HTML 1041Markdown 12TOML 94780 Definiciones

Add test_fixtures/_scratch dir to gitignore (#739)

3bcce12d282670bd9d88e07b85aa9bda278832b1 · por Nico Burns · (hace 1 año) · padre e8674f920 · ver el árbol en este commit

Delta semántico · 2

scripts/gentest/src/main.rs

  • cambió por dentro fn main

src/compute/grid/mod.rs

3 archivos · +9 −12

diff --git a/.gitignore b/.gitignore
index f96714117..8c2b6605e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /scripts/gentest/target
 /yoga_test_fixtures
 /yoga_test_fixtures_grouped
+/test_fixtures/_scratch
 
 **/*.rs.bk
 Cargo.lock
diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs
index 869899fa1..ab69c7335 100644
--- a/scripts/gentest/src/main.rs
+++ b/scripts/gentest/src/main.rs
@@ -1,3 +1,4 @@
+use std::ffi::OsStr;
 use std::fs::{self, OpenOptions};
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -65,6 +66,7 @@ async fn main() {
     let mut fixtures: Vec<_> = WalkDir::new(fixtures_root.clone())
         .into_iter()
         .filter_map(|a| a.ok())
+        .filter(|f| !f.path().components().any(|c| c.as_os_str() == OsStr::new("_scratch")))
         .filter(|f| !f.file_name().to_string_lossy().starts_with('x')) // ignore tests beginning with x
         .filter(|f| f.path().is_file() && f.path().extension().map(|p| p == "html").unwrap_or(false))
         .map(|f| {
diff --git a/src/compute/grid/mod.rs b/src/compute/grid/mod.rs
index 5bba6bdfb..23dd03acd 100644
--- a/src/compute/grid/mod.rs
+++ b/src/compute/grid/mod.rs
@@ -330,10 +330,8 @@ pub fn compute_grid_layout(tree: &mut impl LayoutGridContainer, node: NodeId, in
     rerun_column_sizing = parent_width_indefinite && has_percentage_column;
 
     if !rerun_column_sizing {
-        let min_content_contribution_changed = items
-            .iter_mut()
-            .filter(|item| item.crosses_intrinsic_column)
-            .map(|item| {
+        let min_content_contribution_changed =
+            items.iter_mut().filter(|item| item.crosses_intrinsic_column).any(|item| {
                 let available_space = item.available_space(
                     AbstractAxis::Inline,
                     &rows,
@@ -351,8 +349,7 @@ pub fn compute_grid_layout(tree: &mut impl LayoutGridContainer, node: NodeId, in
                 item.minimum_contribution_cache.width = None;
 
                 has_changed
-            })
-            .any(|has_changed| has_changed);
+            });
         rerun_column_sizing = min_content_contribution_changed;
     } else {
         // Clear intrisic width caches
@@ -392,10 +389,8 @@ pub fn compute_grid_layout(tree: &mut impl LayoutGridContainer, node: NodeId, in
         rerun_row_sizing = parent_height_indefinite && has_percentage_row;
 
         if !rerun_row_sizing {
-            let min_content_contribution_changed = items
-                .iter_mut()
-                .filter(|item| item.crosses_intrinsic_column)
-                .map(|item| {
+            let min_content_contribution_changed =
+                items.iter_mut().filter(|item| item.crosses_intrinsic_column).any(|item| {
                     let available_space = item.available_space(
                         AbstractAxis::Block,
                         &columns,
@@ -413,8 +408,7 @@ pub fn compute_grid_layout(tree: &mut impl LayoutGridContainer, node: NodeId, in
                     item.minimum_contribution_cache.height = None;
 
                     has_changed
-                })
-                .any(|has_changed| has_changed);
+                });
             rerun_row_sizing = min_content_contribution_changed;
         } else {
             items.iter_mut().for_each(|item| {