From 97652605677808a24fd86b46b1e6c720e74e2805 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Tue, 27 Feb 2024 14:29:27 -0700 Subject: [PATCH] Upgrade palette (#8506) This fixes the compilation stck overflow here: https://ogeon.github.io/2024/02/25/palette-0.7.5.html Release Notes: - N/A --- Cargo.lock | 63 ++++---------------------------- Cargo.toml | 1 + crates/color/Cargo.toml | 2 +- crates/theme/Cargo.toml | 2 +- crates/theme_importer/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c25d52bed8..0a9921b248 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1455,7 +1455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ "borsh-derive", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -6179,21 +6179,20 @@ dependencies = [ [[package]] name = "palette" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" dependencies = [ "approx", "fast-srgb8", "palette_derive", - "phf", ] [[package]] name = "palette_derive" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", @@ -6371,48 +6370,6 @@ dependencies = [ "indexmap 2.0.0", ] -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - [[package]] name = "picker" version = "0.1.0" @@ -8454,12 +8411,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "slab" version = "0.4.9" @@ -9047,7 +8998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff" dependencies = [ "float-cmp", - "siphasher 0.2.3", + "siphasher", ] [[package]] @@ -10492,7 +10443,7 @@ dependencies = [ "roxmltree 0.14.1", "rustybuzz 0.3.0", "simplecss", - "siphasher 0.2.3", + "siphasher", "svgtypes", "ttf-parser 0.12.3", "unicode-bidi", diff --git a/Cargo.toml b/Cargo.toml index 7e8179c50b..57d2a0b3fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -216,6 +216,7 @@ lazy_static = "1.4.0" linkify = "0.10.0" log = { version = "0.4.16", features = ["kv_unstable_serde"] } ordered-float = "2.1.1" +palette = { version = "0.7.5", default-features = false, features = ["std"] } parking_lot = "0.11.1" profiling = "1" postage = { version = "0.5", features = ["futures-traits"] } diff --git a/crates/color/Cargo.toml b/crates/color/Cargo.toml index b1db0cc119..d3e4a125f4 100644 --- a/crates/color/Cargo.toml +++ b/crates/color/Cargo.toml @@ -13,4 +13,4 @@ path = "src/color.rs" doctest = true [dependencies] -palette = "0.7.3" +palette.workspace = true diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml index 55ff0cfff6..fff134af84 100644 --- a/crates/theme/Cargo.toml +++ b/crates/theme/Cargo.toml @@ -23,7 +23,7 @@ fs.workspace = true futures.workspace = true gpui.workspace = true indexmap = { version = "1.6.2", features = ["serde"] } -palette = { version = "0.7.3", default-features = false, features = ["std"] } +palette = { workspace = true, default-features = false, features = ["std"] } parking_lot.workspace = true refineable.workspace = true schemars = { workspace = true, features = ["indexmap"] } diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml index e53343d07d..75d9724342 100644 --- a/crates/theme_importer/Cargo.toml +++ b/crates/theme_importer/Cargo.toml @@ -11,7 +11,7 @@ clap = { version = "4.4", features = ["derive"] } gpui.workspace = true indexmap = { version = "1.6.2", features = ["serde"] } log.workspace = true -palette = { version = "0.7.3", default-features = false, features = ["std"] } +palette.workspace = true rust-embed.workspace = true schemars = { workspace = true, features = ["indexmap"] } serde.workspace = true