From 2a652dcc016fa8ab6fc2cff788847b6ae598b6d2 Mon Sep 17 00:00:00 2001 From: Floyd Wang Date: Wed, 27 Aug 2025 17:44:10 +0800 Subject: [PATCH] chore: Bump gpui & wireup `Keystroke` changes (#1176) --- Cargo.lock | 28 ++++++++++++++-------------- crates/ui/src/kbd.rs | 6 +++--- crates/ui/src/menu/popup_menu.rs | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bbd57e2..3ac14f38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -709,7 +709,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -732,7 +732,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -1401,7 +1401,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "indexmap 2.10.0", "rustc-hash 2.1.1", @@ -1870,7 +1870,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "proc-macro2", "quote", @@ -3058,7 +3058,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -3243,7 +3243,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3512,7 +3512,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "bytes", @@ -3532,7 +3532,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "rustls", "rustls-platform-verifier", @@ -4486,7 +4486,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "bindgen 0.71.1", @@ -6400,7 +6400,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "derive_refineable", "workspace-hack", @@ -6553,7 +6553,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "bytes", @@ -7130,7 +7130,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "serde", @@ -7753,7 +7753,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "arrayvec", "log", @@ -9063,7 +9063,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#5d2bb2466e4dc6d98063737a012b638c9deb2284" +source = "git+https://github.com/zed-industries/zed.git#b4d4294bee6840e09814e399fb78dd7201c9247a" dependencies = [ "anyhow", "async-fs 2.1.3", diff --git a/crates/ui/src/kbd.rs b/crates/ui/src/kbd.rs index 3bd423ab..e79e0b31 100644 --- a/crates/ui/src/kbd.rs +++ b/crates/ui/src/kbd.rs @@ -1,6 +1,6 @@ use gpui::{ - div, relative, Action, IntoElement, KeyContext, Keystroke, ParentElement as _, RenderOnce, - StyleRefinement, Styled, Window, + div, relative, Action, AsKeystroke, IntoElement, KeyContext, Keystroke, ParentElement as _, + RenderOnce, StyleRefinement, Styled, Window, }; use crate::{ActiveTheme, StyledExt}; @@ -52,7 +52,7 @@ impl Kbd { bindings.first().and_then(|binding| { if let Some(key) = binding.keystrokes().first() { - Some(Self::new(key.clone())) + Some(Self::new(key.as_keystroke().clone())) } else { None } diff --git a/crates/ui/src/menu/popup_menu.rs b/crates/ui/src/menu/popup_menu.rs index 1ecb02f8..f6798afb 100644 --- a/crates/ui/src/menu/popup_menu.rs +++ b/crates/ui/src/menu/popup_menu.rs @@ -12,7 +12,7 @@ use gpui::{ InteractiveElement, IntoElement, KeyBinding, ParentElement, Pixels, Render, ScrollHandle, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window, }; -use gpui::{MouseDownEvent, Subscription}; +use gpui::{AsKeystroke, MouseDownEvent, Subscription}; use std::ops::Deref; use std::rc::Rc; @@ -634,7 +634,7 @@ impl PopupMenu { key_binding .keystrokes() .into_iter() - .map(|key| Kbd::format(key)), + .map(|key| Kbd::format(key.as_keystroke())), ); return Some(el);