diff --git a/Cargo.lock b/Cargo.lock index e065fd020ba..fb5eeeab8df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4412,7 +4412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -9751,9 +9751,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fb9d22ffe63c7aa8996275aa0017404b513619bb6cf6309d9f822095afb414" +checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859" dependencies = [ "arrayvec", "grid", diff --git a/Cargo.toml b/Cargo.toml index e8ec5b7d59a..0f6fac06ec4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -183,7 +183,7 @@ stylo_traits = { git = "https://github.com/servo/stylo", rev = "96ceb5405bd7ce10 surfman = { version = "0.12.0", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" -taffy = { version = "0.10", default-features = false, features = ["calc", "detailed_layout_info", "grid", "std"] } +taffy = { version = "0.10.1", default-features = false, features = ["calc", "detailed_layout_info", "grid", "std"] } tendril = { version = "0.5", features = ["encoding_rs"] } tikv-jemalloc-sys = "0.6.1" tikv-jemallocator = "0.6.1" diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html.ini deleted file mode 100644 index 2028fb699ad..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-005.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html.ini deleted file mode 100644 index 6ea324fc944..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-007.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html.ini deleted file mode 100644 index 90df34fd254..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-009.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html.ini deleted file mode 100644 index 65d546ab861..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-010.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html.ini deleted file mode 100644 index 30616673339..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-012.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html.ini deleted file mode 100644 index 4ea957d0b44..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-014.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html.ini deleted file mode 100644 index cf9ba557cb4..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-015.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html.ini deleted file mode 100644 index 0b81b20e005..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-017.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html.ini deleted file mode 100644 index 4e5d21fbb09..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-019.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html.ini deleted file mode 100644 index ec0d3ec86ad..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-020.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html.ini deleted file mode 100644 index ee1b87bb4ed..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-022.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html.ini deleted file mode 100644 index 57a764b4350..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-content-distribution-with-collapsed-tracks-024.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini deleted file mode 100644 index 70def1ffbc6..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini +++ /dev/null @@ -1,12 +0,0 @@ -[grid-auto-fill-columns-001.html] - [.grid 21] - expected: FAIL - - [.grid 23] - expected: FAIL - - [.grid 24] - expected: FAIL - - [.grid 25] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini deleted file mode 100644 index 62a643ae2a9..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini +++ /dev/null @@ -1,12 +0,0 @@ -[grid-auto-fill-rows-001.html] - [.grid 23] - expected: FAIL - - [.grid 25] - expected: FAIL - - [.grid 26] - expected: FAIL - - [.grid 27] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini deleted file mode 100644 index 0fff12a46b7..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini +++ /dev/null @@ -1,18 +0,0 @@ -[grid-auto-fit-columns-001.html] - [.grid 21] - expected: FAIL - - [.grid 23] - expected: FAIL - - [.grid 24] - expected: FAIL - - [.grid 25] - expected: FAIL - - [.grid 34] - expected: FAIL - - [.grid 35] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini deleted file mode 100644 index 3c8583f656f..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini +++ /dev/null @@ -1,12 +0,0 @@ -[grid-auto-fit-rows-001.html] - [.grid 21] - expected: FAIL - - [.grid 23] - expected: FAIL - - [.grid 24] - expected: FAIL - - [.grid 25] - expected: FAIL