diff --git a/Cargo.lock b/Cargo.lock index b4c84956..9ab8d88c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,6 +781,26 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" +[[package]] +name = "bindgen" +version = "0.71.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +dependencies = [ + "bitflags 2.13.2", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.3", + "shlex 1.3.0", + "syn 2.0.119", +] + [[package]] name = "bindgen" version = "0.72.1" @@ -1255,12 +1275,22 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "collections" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "indexmap 2.14.2", + "rustc-hash 2.1.3", +] + [[package]] name = "collections" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ - "gpui_util", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "indexmap 2.14.2", "rustc-hash 2.1.3", ] @@ -1894,6 +1924,16 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "derive_refineable" version = "0.1.0" @@ -1954,7 +1994,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1992,7 +2032,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]] @@ -2176,7 +2216,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]] @@ -2500,7 +2540,7 @@ name = "forge-components" version = "0.5.1" dependencies = [ "fluent", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "time", "tracing", "unic-langid", @@ -2545,7 +2585,7 @@ dependencies = [ "forge-voice", "forge-vtube", "futures-util", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "gpui_platform", "open", "rand 0.10.2", @@ -3442,17 +3482,17 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" dependencies = [ "accesskit", "anyhow", "async-channel", "async-task", "backtrace", - "bindgen", + "bindgen 0.71.1", "bitflags 2.13.2", "chrono", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "core-video", "ctor", "derive_more", @@ -3461,11 +3501,11 @@ 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.19.2)", + "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "heapless", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "image", "inventory", "itertools 0.14.0", @@ -3481,10 +3521,10 @@ dependencies = [ "proptest", "rand 0.9.5", "raw-window-handle", - "refineable", + "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "regex", "resvg", - "scheduler", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "schemars 1.2.2", "seahash", "serde", @@ -3493,21 +3533,88 @@ dependencies = [ "smallvec", "spin 0.10.1", "strum 0.28.0", - "sum_tree", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "taffy", "thiserror 2.0.20", "tracing", "ttf-parser", "url", "usvg", - "util_macros", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", "uuid", "waker-fn", "web-time", - "windows 0.62.2", + "windows 0.61.3", "zed-font-kit", "zed-scap", - "ztracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", +] + +[[package]] +name = "gpui" +version = "0.2.2" +source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" +dependencies = [ + "accesskit", + "anyhow", + "async-channel", + "async-task", + "bindgen 0.72.1", + "bitflags 2.13.2", + "chrono", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "core-video", + "ctor", + "derive_more", + "embed-resource", + "etagere", + "futures", + "futures-concurrency", + "getrandom 0.3.4", + "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "heapless", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "image", + "inventory", + "itertools 0.14.0", + "log", + "lyon", + "num_cpus", + "parking", + "parking_lot", + "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.20.2)", + "regex", + "resvg", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "schemars 1.2.2", + "seahash", + "serde", + "serde_json", + "slotmap", + "smallvec", + "spin 0.10.1", + "strum 0.28.0", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "taffy", + "thiserror 2.0.20", + "tracing", + "ttf-parser", + "url", + "usvg", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "uuid", + "waker-fn", + "web-time", + "windows 0.62.2", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", ] [[package]] @@ -3519,13 +3626,13 @@ dependencies = [ "block", "cbindgen", "cocoa 0.26.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "core-foundation 0.10.1", "core-video", "derive_more", "etagere", "foreign-types", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "image", "log", "metal", @@ -3547,13 +3654,13 @@ dependencies = [ "bytemuck", "calloop", "calloop-wayland-source", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "filedescriptor", "futures", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "gpui_wgpu", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "libc", "log", "notify-rust", @@ -3591,7 +3698,7 @@ dependencies = [ "block", "block2 0.6.2", "cocoa 0.26.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", @@ -3600,9 +3707,9 @@ dependencies = [ "dispatch2", "foreign-types", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "gpui_apple", - "gpui_util", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "image", "itertools 0.14.0", "libc", @@ -3625,6 +3732,17 @@ dependencies = [ "zed-font-kit", ] +[[package]] +name = "gpui_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "gpui_macros" version = "0.1.0" @@ -3642,13 +3760,23 @@ version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ "console_error_panic_hook", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "gpui_linux", "gpui_macos", "gpui_web", "gpui_windows", ] +[[package]] +name = "gpui_shared_string" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "schemars 1.2.2", + "serde", + "smol_str", +] + [[package]] name = "gpui_shared_string" version = "0.1.0" @@ -3659,6 +3787,16 @@ dependencies = [ "smol_str", ] +[[package]] +name = "gpui_util" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "anyhow", + "log", + "which", +] + [[package]] name = "gpui_util" version = "0.1.0" @@ -3677,14 +3815,14 @@ dependencies = [ "anyhow", "console_error_panic_hook", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "gpui_wgpu", - "http_client", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "js-sys", "log", "parking_lot", "raw-window-handle", - "scheduler", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "uuid", "wasm-bindgen", "wasm-bindgen-futures", @@ -3700,11 +3838,11 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee dependencies = [ "anyhow", "bytemuck", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "cosmic-text", "etagere", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "itertools 0.14.0", "log", "parking_lot", @@ -3727,12 +3865,12 @@ dependencies = [ "accesskit", "accesskit_windows", "anyhow", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "dunce", "etagere", "futures", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "image", "itertools 0.14.0", "log", @@ -3962,6 +4100,26 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" +[[package]] +name = "http_client" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "anyhow", + "async-compression", + "bytes", + "derive_more", + "futures", + "http", + "http-body", + "log", + "parking_lot", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + [[package]] name = "http_client" version = "0.1.0" @@ -5012,7 +5170,7 @@ version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ "anyhow", - "bindgen", + "bindgen 0.72.1", "core-foundation 0.10.1", "core-video", "foreign-types", @@ -5329,7 +5487,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]] @@ -5911,7 +6069,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]] @@ -5990,12 +6148,22 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "perf" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "serde", + "serde_json", +] + [[package]] name = "perf" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "serde", "serde_json", ] @@ -6472,7 +6640,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6775,12 +6943,20 @@ dependencies = [ "syn 3.0.6", ] +[[package]] +name = "refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", +] + [[package]] name = "refineable" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ - "derive_refineable", + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", ] [[package]] @@ -7043,7 +7219,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -7100,7 +7276,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -7181,6 +7357,21 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "scheduler" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "async-task", + "backtrace", + "chrono", + "flume", + "futures", + "parking_lot", + "rand 0.9.5", + "web-time", +] + [[package]] name = "scheduler" version = "0.1.0" @@ -7701,7 +7892,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]] @@ -8001,6 +8192,18 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "sum_tree" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "heapless", + "log", + "rayon", + "tracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", +] + [[package]] name = "sum_tree" version = "0.1.0" @@ -8010,7 +8213,7 @@ dependencies = [ "log", "rayon", "tracing", - "ztracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", ] [[package]] @@ -8433,7 +8636,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -9120,7 +9323,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9300,12 +9503,22 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "util_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "quote", + "syn 2.0.119", +] + [[package]] name = "util_macros" version = "0.1.0" source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee0aeb01d7e28b5fa18cd0ad2f" dependencies = [ - "perf", + "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "quote", "syn 2.0.119", ] @@ -9901,7 +10114,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]] @@ -10946,6 +11159,17 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" +[[package]] +name = "zlog" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "anyhow", + "chrono", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "log", +] + [[package]] name = "zlog" version = "0.1.0" @@ -10953,7 +11177,7 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee dependencies = [ "anyhow", "chrono", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", "log", ] @@ -10963,6 +11187,17 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" +[[package]] +name = "ztracing" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" +dependencies = [ + "tracing", + "tracing-subscriber", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.19.2)", +] + [[package]] name = "ztracing" version = "0.1.0" @@ -10970,10 +11205,15 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.20.2#7c451e694f3c52ee dependencies = [ "tracing", "tracing-subscriber", - "zlog", - "ztracing_macro", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.20.2)", ] +[[package]] +name = "ztracing_macro" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?tag=v1.19.2#df181c6f58d02677b385fa947d6bfde6d3530078" + [[package]] name = "ztracing_macro" version = "0.1.0"