diff --git a/Cargo.lock b/Cargo.lock index 2728b594..36873973 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1294,7 +1294,17 @@ name = "collections" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" dependencies = [ - "gpui_util", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "indexmap 2.14.0", + "rustc-hash 2.1.3", +] + +[[package]] +name = "collections" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "indexmap 2.14.0", "rustc-hash 2.1.3", ] @@ -1876,6 +1886,16 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "derive_refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "digest" version = "0.10.7" @@ -1926,7 +1946,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1964,7 +1984,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a" dependencies = [ - "libloading 0.8.9", + "libloading 0.7.4", ] [[package]] @@ -2132,7 +2152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2455,7 +2475,7 @@ name = "forge-components" version = "0.5.0" dependencies = [ "fluent", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "time", "tracing", "unic-langid", @@ -2500,7 +2520,7 @@ dependencies = [ "forge-voice", "forge-vtube", "futures-util", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "gpui_platform", "open", "rand 0.10.2", @@ -3387,6 +3407,86 @@ dependencies = [ name = "gpui" version = "0.2.2" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" +dependencies = [ + "accesskit", + "anyhow", + "async-channel", + "async-task", + "bindgen", + "bitflags 2.13.1", + "block", + "cbindgen", + "chrono", + "cocoa 0.26.0", + "cocoa-foundation 0.2.0", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "core-foundation 0.10.0", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", + "core-video", + "ctor", + "derive_more", + "embed-resource", + "etagere", + "foreign-types", + "futures", + "futures-concurrency", + "getrandom 0.3.4", + "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "heapless", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "image", + "inventory", + "itertools 0.14.0", + "log", + "lyon", + "mach2 0.5.0", + "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "metal", + "num_cpus", + "objc", + "parking", + "parking_lot", + "pathfinder_geometry", + "pin-project", + "pollster 0.4.0", + "postage", + "profiling", + "rand 0.9.5", + "raw-window-handle", + "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "regex", + "resvg", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "schemars 1.2.2", + "seahash", + "serde", + "serde_json", + "slotmap", + "smallvec", + "spin 0.10.1", + "stacksafe", + "strum", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "taffy 0.10.1", + "thiserror 2.0.19", + "ttf-parser", + "url", + "usvg", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "uuid", + "waker-fn", + "web-time", + "windows 0.61.3", +] + +[[package]] +name = "gpui" +version = "0.2.2" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" dependencies = [ "accesskit", "anyhow", @@ -3400,7 +3500,7 @@ dependencies = [ "chrono", "cocoa 0.26.0", "cocoa-foundation 0.2.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "core-foundation 0.10.0", "core-foundation-sys", "core-graphics 0.24.0", @@ -3414,18 +3514,18 @@ dependencies = [ "futures", "futures-concurrency", "getrandom 0.3.4", - "gpui_macros", - "gpui_shared_string", - "gpui_util", + "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", + "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "heapless", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "image", "inventory", "itertools 0.14.0", "log", "lyon", "mach2 0.5.0", - "media", + "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "metal", "num_cpus", "objc", @@ -3439,10 +3539,10 @@ dependencies = [ "proptest", "rand 0.9.5", "raw-window-handle", - "refineable", + "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "regex", "resvg", - "scheduler", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "schemars 1.2.2", "seahash", "serde", @@ -3452,13 +3552,13 @@ dependencies = [ "spin 0.10.1", "stacksafe", "strum", - "sum_tree", - "taffy", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", + "taffy 0.12.2", "thiserror 2.0.19", "ttf-parser", "url", "usvg", - "util_macros", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "uuid", "waker-fn", "web-time", @@ -3481,13 +3581,13 @@ dependencies = [ "bytemuck", "calloop", "calloop-wayland-source", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "filedescriptor", "futures", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "gpui_wgpu", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "image", "itertools 0.14.0", "libc", @@ -3530,7 +3630,7 @@ dependencies = [ "block", "cbindgen", "cocoa 0.26.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "core-foundation 0.10.0", "core-foundation-sys", "core-graphics 0.24.0", @@ -3542,14 +3642,14 @@ dependencies = [ "etagere", "foreign-types", "futures", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "image", "itertools 0.14.0", "libc", "log", "mach2 0.5.0", - "media", + "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "metal", "objc", "objc2 0.6.4", @@ -3576,13 +3676,24 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "gpui_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "gpui_platform" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" dependencies = [ "console_error_panic_hook", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "gpui_linux", "gpui_macos", "gpui_web", @@ -3599,6 +3710,16 @@ dependencies = [ "smol_str", ] +[[package]] +name = "gpui_shared_string" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "schemars 1.2.2", + "serde", + "smol_str", +] + [[package]] name = "gpui_util" version = "0.1.0" @@ -3609,6 +3730,16 @@ dependencies = [ "which", ] +[[package]] +name = "gpui_util" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "anyhow", + "log", + "which", +] + [[package]] name = "gpui_web" version = "0.1.0" @@ -3617,9 +3748,9 @@ dependencies = [ "anyhow", "console_error_panic_hook", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "gpui_wgpu", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "js-sys", "log", "parking_lot", @@ -3640,11 +3771,11 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22 dependencies = [ "anyhow", "bytemuck", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "cosmic-text", "etagere", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "itertools 0.14.0", "js-sys", "log", @@ -3670,12 +3801,12 @@ dependencies = [ "accesskit", "accesskit_windows", "anyhow", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "dunce", "etagere", "futures", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", "image", "itertools 0.14.0", "log", @@ -3940,6 +4071,26 @@ dependencies = [ "url", ] +[[package]] +name = "http_client" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "anyhow", + "async-compression", + "bytes", + "derive_more", + "futures", + "http", + "http-body", + "log", + "parking_lot", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + [[package]] name = "httparse" version = "1.10.1" @@ -4820,6 +4971,21 @@ dependencies = [ "objc", ] +[[package]] +name = "media" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "anyhow", + "bindgen", + "core-foundation 0.10.0", + "core-video", + "ctor", + "foreign-types", + "metal", + "objc", +] + [[package]] name = "memchr" version = "2.8.3" @@ -5092,7 +5258,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5651,7 +5817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.45.0", ] [[package]] @@ -5735,7 +5901,17 @@ name = "perf" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" dependencies = [ - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "serde", + "serde_json", +] + +[[package]] +name = "perf" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "serde", "serde_json", ] @@ -6243,7 +6419,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6552,7 +6728,15 @@ name = "refineable" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" dependencies = [ - "derive_refineable", + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", +] + +[[package]] +name = "refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", ] [[package]] @@ -6815,7 +6999,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6828,7 +7012,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6885,7 +7069,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6981,6 +7165,21 @@ dependencies = [ "web-time", ] +[[package]] +name = "scheduler" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "async-task", + "backtrace", + "chrono", + "flume", + "futures", + "parking_lot", + "rand 0.9.5", + "web-time", +] + [[package]] name = "schemars" version = "0.9.0" @@ -7473,7 +7672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7700,7 +7899,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7798,7 +7997,19 @@ dependencies = [ "log", "rayon", "tracing", - "ztracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", +] + +[[package]] +name = "sum_tree" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "heapless", + "log", + "rayon", + "tracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", ] [[package]] @@ -8188,6 +8399,18 @@ dependencies = [ "slotmap", ] +[[package]] +name = "taffy" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340a09581f29809fc0df82a3955501dc7f2a21f887e5d1c13dbe288fe1c0bef4" +dependencies = [ + "arrayvec", + "grid", + "serde", + "slotmap", +] + [[package]] name = "tao-core-video-sys" version = "0.2.0" @@ -8221,7 +8444,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8917,7 +9140,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9102,7 +9325,17 @@ name = "util_macros" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" dependencies = [ - "perf", + "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "util_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "quote", "syn 2.0.119", ] @@ -9691,7 +9924,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -10734,7 +10967,18 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22 dependencies = [ "anyhow", "chrono", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "log", +] + +[[package]] +name = "zlog" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "anyhow", + "chrono", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", "log", ] @@ -10751,8 +10995,19 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22 dependencies = [ "tracing", "tracing-subscriber", - "zlog", - "ztracing_macro", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.12.1)", +] + +[[package]] +name = "ztracing" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" +dependencies = [ + "tracing", + "tracing-subscriber", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.14.2)", ] [[package]] @@ -10760,6 +11015,11 @@ name = "ztracing_macro" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.12.1#2a37601c02a32b22e7700835c04b89ff75ffcd5d" +[[package]] +name = "ztracing_macro" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.14.2#02abf5b08fa12c1c20a155ae3f796ef4c6c1a01e" + [[package]] name = "zune-core" version = "0.5.1"