diff --git a/Cargo.lock b/Cargo.lock index 9357a06f..e9957acd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -632,7 +632,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "lazycell", "log", @@ -655,7 +655,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.11.0", "log", "prettyplease", "proc-macro2", @@ -1212,7 +1212,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "indexmap 2.7.1", "rustc-hash 2.1.0", @@ -1725,7 +1725,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "proc-macro2", "quote", @@ -2743,7 +2743,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2867,8 +2867,9 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.101", @@ -3136,7 +3137,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "bytes", @@ -3153,7 +3154,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3920,7 +3921,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "bindgen 0.71.1", @@ -5665,7 +5666,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "derive_refineable", "workspace-hack", @@ -5760,7 +5761,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "bytes", @@ -6293,7 +6294,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "serde", @@ -6774,7 +6775,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "arrayvec", "log", @@ -7612,7 +7613,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#85befe24cc564f1f526ead3b09fd22d98b146248" dependencies = [ "anyhow", "async-fs 2.1.2", @@ -7636,6 +7637,8 @@ dependencies = [ "tempfile", "tendril", "unicase", + "unicode-script", + "unicode-segmentation", "walkdir", "workspace-hack", ] diff --git a/crates/ui/src/styled.rs b/crates/ui/src/styled.rs index dd653df5..f13539fa 100644 --- a/crates/ui/src/styled.rs +++ b/crates/ui/src/styled.rs @@ -49,7 +49,7 @@ pub trait StyledExt: Styled + Sized { /// Apply paddings to the element. fn paddings(self, paddings: impl Into>) -> Self where - L: Into + Clone + Default + std::fmt::Debug, + L: Into + Clone + Default + std::fmt::Debug + PartialEq, { let paddings = paddings.into(); self.pt(paddings.top.into()) @@ -61,7 +61,7 @@ pub trait StyledExt: Styled + Sized { /// Apply margins to the element. fn margins(self, margins: impl Into>) -> Self where - L: Into + Clone + Default + std::fmt::Debug, + L: Into + Clone + Default + std::fmt::Debug + PartialEq, { let margins = margins.into(); self.mt(margins.top.into())