diff --git a/Cargo.lock b/Cargo.lock index 759f115829..b8ae75b473 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -788,7 +788,7 @@ dependencies = [ "bitflags 2.13.1", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -1110,7 +1110,7 @@ dependencies = [ "maybe-owned", "rustix", "rustix-linux-procfs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", "winx", ] @@ -2367,7 +2367,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2715,7 +2715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3968,9 +3968,9 @@ dependencies = [ [[package]] name = "gpui-pre" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9ca98fdcad06276de623c2f48ebd710f1e7724eebef2f2673c583e85dc8335" +checksum = "a0437c0b83e636a92bd1a39fa1d05fb632ae671289537497b35871ffbe231b84" dependencies = [ "accesskit", "anyhow", @@ -3998,7 +3998,6 @@ dependencies = [ "gpui-pre-sum-tree", "gpui-pre-util", "gpui-pre-util-macros", - "gpui-pre-ztracing", "hdrhistogram", "heapless", "image", @@ -4007,6 +4006,8 @@ dependencies = [ "log", "lyon", "num_cpus", + "objc2-core-foundation", + "objc2-core-video", "parking", "parking_lot", "pin-project", @@ -4028,7 +4029,6 @@ dependencies = [ "strum", "taffy", "thiserror 2.0.20", - "tracing", "ttf-parser", "url", "usvg 0.46.0", @@ -4042,9 +4042,9 @@ dependencies = [ [[package]] name = "gpui-pre-apple" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fc4da82c5c2dbb25443655cfbc4305a2e2d1380bc0b815e80664fdfbf4cfdb" +checksum = "3af534f0746eb9e014114bcc0ee00dc250c4b8d75df2e437180c403aa65649c1" dependencies = [ "anyhow", "block", @@ -4056,7 +4056,6 @@ dependencies = [ "etagere", "foreign-types", "gpui-pre", - "gpui-pre-collections", "image", "log", "metal", @@ -4067,9 +4066,9 @@ dependencies = [ [[package]] name = "gpui-pre-collections" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626a09f683ff6f3b2f708341bdcea9d479af5b14a6a2fccec9cff935ec0751b7" +checksum = "15e7a65204039187d1f4b3d4c2e0233eeac54d4acb0b13f9dc1a3b5adad26c1f" dependencies = [ "gpui-pre-util", "indexmap", @@ -4078,9 +4077,9 @@ dependencies = [ [[package]] name = "gpui-pre-derive-refineable" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d06116a2b857588f6ea7bfb447b3554ba985e780b5995ae47780252da152f3" +checksum = "79dfb4a05f3cd9893d7768dbf5dba1bbbe99cab7394e89b360ccb3b2bcb6b34e" dependencies = [ "proc-macro2", "quote", @@ -4089,9 +4088,9 @@ dependencies = [ [[package]] name = "gpui-pre-http-client" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d2071c582c1a0f71b8c7c00607a3b9cd18f81fb3510d41845db3447b2a11c9" +checksum = "cfd5a7542c77887a5aff997d78c95884119c8463409569b63fcf060956da1682" dependencies = [ "anyhow", "async-compression", @@ -4110,9 +4109,9 @@ dependencies = [ [[package]] name = "gpui-pre-http-client-tls" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6f3936802580259d5af9bcb2ab37fb0d7002caeed449eaabb007c62aea7341" +checksum = "72aed510adb5e7723f8f57b9751007e3451d46a84edb59b92227178cf59cc19c" dependencies = [ "log", "rustls", @@ -4122,9 +4121,9 @@ dependencies = [ [[package]] name = "gpui-pre-linux" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b427589681ec1fed27951fd82edc70a7e288bb2487ede26dbbd07c2ce23d4f" +checksum = "aab655cda1d6dcd549ac869e8678babc84cf573ab6794a1fe1a39c6c70c60b48" dependencies = [ "accesskit", "accesskit_unix", @@ -4169,15 +4168,14 @@ dependencies = [ [[package]] name = "gpui-pre-macos" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806eac0cb5c0eebc0b032c6450c11d283264f9ac05754dda83fc80d0b86b4ee8" +checksum = "951d17e41a72067ad2d35c60e08a62e8ad7fa9400b41c802e26cfb459f6c05da" dependencies = [ "accesskit", "accesskit_macos", "anyhow", "async-task", - "block", "block2 0.6.2", "cocoa 0.26.0", "core-foundation 0.10.1", @@ -4191,17 +4189,17 @@ dependencies = [ "gpui-pre", "gpui-pre-apple", "gpui-pre-collections", - "gpui-pre-media", "gpui-pre-util", "image", "itertools 0.14.0", "libc", "log", "mach2", - "metal", "objc", "objc2 0.6.4", "objc2-app-kit 0.3.2", + "objc2-core-graphics", + "objc2-core-media", "objc2-foundation 0.3.2", "objc2-screen-capture-kit", "objc2-user-notifications", @@ -4217,9 +4215,9 @@ dependencies = [ [[package]] name = "gpui-pre-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06139051bf1db51949bfbb4ee338208bd64b4c35340d8c1a6a8200744e28fe1" +checksum = "6324092b40ea8ec7c327a4a28427e366a489b4d5d23b5d1bd0243fc2f4ca7a9e" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.5.0", @@ -4228,26 +4226,11 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "gpui-pre-media" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500acb13f818ff234021c1b9eae8592b0cbe017a64e26908c736b7421b1c6213" -dependencies = [ - "anyhow", - "bindgen", - "core-foundation 0.10.1", - "core-video", - "foreign-types", - "metal", - "objc", -] - [[package]] name = "gpui-pre-perf" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0973bbb02bf46940ac0861d9dce0fc03a3109634172b69108d1bc13fa29d76c" +checksum = "b94bff26ccd8105f6206144f8dab16a2dc02e7a68f39dada02cdf492f0afd940" dependencies = [ "gpui-pre-collections", "serde", @@ -4256,9 +4239,9 @@ dependencies = [ [[package]] name = "gpui-pre-platform" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b613512e29f1e7b825bfa7e50a447388ff1347044350a475e4c98a892a985c8d" +checksum = "8423d1e0a693d2f9f16c0326bb01b5e81ec0531854d596a18476934ac6880478" dependencies = [ "console_error_panic_hook", "gpui-pre", @@ -4270,9 +4253,9 @@ dependencies = [ [[package]] name = "gpui-pre-refineable" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428f23703ead5601618ffea73c137897b98a94ce8d30e257f22be947732dfbf9" +checksum = "93b4b0a8d296a3ee5beb1136bc48f8167a6028eb1e243b56851dcd8c9fc6d7a1" dependencies = [ "gpui-pre-derive-refineable", ] @@ -4330,9 +4313,9 @@ dependencies = [ [[package]] name = "gpui-pre-reqwest-client" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05d4e3d2eb2ab777597879e46047247447b9d93cef568e63d545c9deb1b3e57" +checksum = "8f32ccea5d1a7c8d2868d7b346c2c1f76aa3f86ec9e0575c4e7340af3afd9e9d" dependencies = [ "anyhow", "bytes", @@ -4348,9 +4331,9 @@ dependencies = [ [[package]] name = "gpui-pre-scheduler" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd1b7ff2e7bf43302ae982cd786a22c16c52e16682e67b66cfbe2cb2bc3a72d" +checksum = "ff7b10b3d2fc3fda24847a04436eca9531612c8414874a37ddc005f20e521e12" dependencies = [ "async-task", "backtrace", @@ -4365,9 +4348,9 @@ dependencies = [ [[package]] name = "gpui-pre-shared-string" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424a4dd6a570473d57acf1df2bfb9f3028d4b568abcaeb9252e0f13047b50c03" +checksum = "fe17f81bd98a0253140ea79f7f76442d7499bd8d17db302861af8e46c11d38df" dependencies = [ "schemars", "serde", @@ -4376,9 +4359,9 @@ dependencies = [ [[package]] name = "gpui-pre-sum-tree" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4855718e82630d29198b515d2b027361ef63dd19b6021cefe945789dcff82372" +checksum = "0a6d35e998a51d24248dad731de1f09d386cbbf46a04edde3b67f469b2ce3f16" dependencies = [ "gpui-pre-ztracing", "heapless", @@ -4389,9 +4372,9 @@ dependencies = [ [[package]] name = "gpui-pre-util" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e973148165346c0f9b3f5072b321d7c2f33807c93daea67fe298c005c0e0c2a8" +checksum = "6a026a30c578930d20974fd8c3d77de36223ac7ba193bd4259e7238929bc8806" dependencies = [ "anyhow", "log", @@ -4400,9 +4383,9 @@ dependencies = [ [[package]] name = "gpui-pre-util-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f71f6212d3772a70988c7d64627c7284dec73c17992ac4f9f0cdfdd46cbb677" +checksum = "5cbf79627a6afc626d4e887dad9d2d92bb069413e8cc692ba3e90bff219eb7a9" dependencies = [ "gpui-pre-perf", "quote", @@ -4411,9 +4394,9 @@ dependencies = [ [[package]] name = "gpui-pre-web" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0daada903f106be946d87e25f5bc85ad6cf60d6d82cb8f8aed945417a9c1a3" +checksum = "34be433b9fcb370b1fe9a1c7fe911f0eb6058791ef8167dcf6c5a5deb624975c" dependencies = [ "anyhow", "console_error_panic_hook", @@ -4440,9 +4423,9 @@ dependencies = [ [[package]] name = "gpui-pre-wgpu" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640b666a16ddf9504e2eb3e7a997acb2b2adfaa7859925bdd36fc3acfd8f30a7" +checksum = "05515b32799b1767d69300921c1b562cd53104965211a0e8905acdc7aa18e693" dependencies = [ "anyhow", "bytemuck", @@ -4467,9 +4450,9 @@ dependencies = [ [[package]] name = "gpui-pre-windows" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12c7d84ec422feb2f064117d572447998381e5c219fcad69fe19f10d0b7aaea" +checksum = "27662e65bfcf4445d2cccfad91f1570ec07f4b1b5de98400a9f207fd19c464cf" dependencies = [ "accesskit", "accesskit_windows", @@ -4496,9 +4479,9 @@ dependencies = [ [[package]] name = "gpui-pre-zlog" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98352858fac3d4d05b46d6014ad04bad313652a691d4e21dc55fa96fb4acb7cf" +checksum = "f3a5af0b734a391a84872eb770b3ee9830091ec2487b79d06371fe14eefb2b5d" dependencies = [ "anyhow", "chrono", @@ -4508,9 +4491,9 @@ dependencies = [ [[package]] name = "gpui-pre-ztracing" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d63a3c7276875b4d7e6d3961e92a138e9233e86a591bf318f2e54df4ad58102" +checksum = "a24cb19f78c5bc3aab8ddf1e8e0bd6b402fbcb9c7f112f64ddbedef8f8768a59" dependencies = [ "gpui-pre-zlog", "gpui-pre-ztracing-macro", @@ -4520,9 +4503,9 @@ dependencies = [ [[package]] name = "gpui-pre-ztracing-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e2a5ff79002223edfcfa76c6f9f79f4f60f6ec545ccc27832f12bd46348b39" +checksum = "a1bb25850ad31b88bbdef454afb93ec4cdb81f5e200ba5b3f1a0368111780d2c" [[package]] name = "gpui-shell" @@ -4985,7 +4968,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.58.0", + "windows-core 0.62.2", ] [[package]] @@ -6542,7 +6525,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6679,7 +6662,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.119", @@ -6780,6 +6763,28 @@ dependencies = [ "objc2-foundation 0.3.2", ] +[[package]] +name = "objc2-core-audio" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2" +dependencies = [ + "dispatch2", + "objc2 0.6.4", + "objc2-core-audio-types", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-core-audio-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c" +dependencies = [ + "bitflags 2.13.1", + "objc2 0.6.4", +] + [[package]] name = "objc2-core-data" version = "0.2.2" @@ -6859,6 +6864,21 @@ dependencies = [ "objc2-foundation 0.3.2", ] +[[package]] +name = "objc2-core-media" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ec576860167a15dd9fce7fbee7512beb4e31f532159d3482d1f9c6caedf31d" +dependencies = [ + "bitflags 2.13.1", + "dispatch2", + "objc2 0.6.4", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-core-video", +] + [[package]] name = "objc2-core-text" version = "0.3.2" @@ -7002,8 +7022,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74b7c5390f477482f001bc354d6571a70db7e4f8d5288e860c45521fbce11394" dependencies = [ "block2 0.6.2", + "dispatch2", "objc2 0.6.4", "objc2-core-graphics", + "objc2-core-media", "objc2-foundation 0.3.2", ] @@ -8213,7 +8235,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -8891,7 +8913,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -8969,7 +8991,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9605,7 +9627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10100,10 +10122,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -11089,7 +11111,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -11998,7 +12020,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d2afef2d40..8e255f1498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,12 +59,12 @@ gpui-wry = { path = "crates/webview", version = "0.6.4" } gpui-component-shell = { path = "crates/component-shell", version = "0.6.4" } story = { path = "crates/story" } -gpui = { package = "gpui-pre", version = "0.3.5" } -gpui_platform = { package = "gpui-pre-platform", version = "0.3.5", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } -gpui_web = { package = "gpui-pre-web", version = "0.3.5" } -gpui_macros = { package = "gpui-pre-macros", version = "0.3.5" } -reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.5" } -sum-tree = { package = "gpui-pre-sum-tree", version = "0.3.5" } +gpui = { package = "gpui-pre", version = "0.3.6" } +gpui_platform = { package = "gpui-pre-platform", version = "0.3.6", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } +gpui_web = { package = "gpui-pre-web", version = "0.3.6" } +gpui_macros = { package = "gpui-pre-macros", version = "0.3.6" } +reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.6" } +sum-tree = { package = "gpui-pre-sum-tree", version = "0.3.6" } reqwest = { package = "gpui-pre-reqwest", version = "0.12.15", default-features = false, features = [ "charset", "http2", diff --git a/crates/component/src/inspector.rs b/crates/component/src/inspector.rs index d4a9f63c29..cd475bb5b0 100644 --- a/crates/component/src/inspector.rs +++ b/crates/component/src/inspector.rs @@ -1,4 +1,4 @@ -use std::{cell::OnceCell, collections::HashMap, fmt::Write as _, rc::Rc, sync::OnceLock}; +use std::{collections::HashMap, fmt::Write as _, rc::Rc, sync::OnceLock}; use anyhow::Result; use gpui::{ @@ -48,13 +48,14 @@ pub(crate) fn init(cx: &mut App) { }); }); - let inspector_el = OnceCell::new(); - cx.register_inspector_element(move |id, state: &DivInspectorState, window, cx| { - let el = inspector_el.get_or_init(|| cx.new(|cx| DivInspector::new(window, cx))); - el.update(cx, |this, cx| { - this.update_inspected_element(id, state.clone(), window, cx); - this.render(window, cx).into_any_element() - }) + cx.register_inspector_element(|window, cx| { + let div_inspector = cx.new(|cx| DivInspector::new(window, cx)); + move |id, state: &DivInspectorState, window: &mut Window, cx: &mut App| { + div_inspector.update(cx, |this, cx| { + this.update_inspected_element(id, state.clone(), window, cx); + this.render(window, cx).into_any_element() + }) + } }); cx.set_inspector_renderer(Box::new(render_inspector));