chore: Update GPUI v0.2.2 (#1416)

This commit is contained in:
Jason Lee 2025-10-23 15:41:50 +08:00 committed by GitHub
parent 3c6a7b6a9b
commit 804a89df20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 206 additions and 205 deletions

400
Cargo.lock generated
View file

@ -405,20 +405,6 @@ dependencies = [
"wasm-bindgen-futures", "wasm-bindgen-futures",
] ]
[[package]]
name = "async-tar"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8"
dependencies = [
"async-std",
"filetime",
"libc",
"pin-project",
"redox_syscall 0.2.16",
"xattr",
]
[[package]] [[package]]
name = "async-task" name = "async-task"
version = "4.7.1" version = "4.7.1"
@ -617,7 +603,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.11.0",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@ -637,7 +623,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.11.0",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@ -1106,14 +1092,14 @@ dependencies = [
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.26.1" version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"block", "block",
"cocoa-foundation 0.2.1", "cocoa-foundation 0.2.0",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics 0.24.0", "core-graphics 0.24.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -1136,14 +1122,15 @@ dependencies = [
[[package]] [[package]]
name = "cocoa-foundation" name = "cocoa-foundation"
version = "0.2.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"block", "block",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics-types 0.2.0", "core-graphics-types 0.2.0",
"libc",
"objc", "objc",
] ]
@ -1253,9 +1240,9 @@ dependencies = [
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.10.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -1287,7 +1274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics-types 0.2.0", "core-graphics-types 0.2.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -1324,7 +1311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"libc", "libc",
] ]
@ -1337,7 +1324,7 @@ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"block", "block",
"cfg-if", "cfg-if",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"libc", "libc",
] ]
@ -1347,7 +1334,7 @@ version = "21.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130"
dependencies = [ dependencies = [
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics 0.24.0", "core-graphics 0.24.0",
"foreign-types 0.5.0", "foreign-types 0.5.0",
"libc", "libc",
@ -1360,7 +1347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef" checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef"
dependencies = [ dependencies = [
"block", "block",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics2", "core-graphics2",
"io-surface", "io-surface",
"libc", "libc",
@ -2734,9 +2721,9 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.2.0" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8a209a56079b7af7d158e410aaad8666edf5ad55450803eaace98a4eef383f7" checksum = "979b45cfa6ec723b6f42330915a1b3769b930d02b2d505f9697f8ca602bee707"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-raw-xcb-connection", "as-raw-xcb-connection",
@ -2752,8 +2739,9 @@ dependencies = [
"calloop", "calloop",
"calloop-wayland-source", "calloop-wayland-source",
"cbindgen", "cbindgen",
"cocoa 0.26.1", "cocoa 0.26.0",
"core-foundation 0.10.1", "cocoa-foundation 0.2.0",
"core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"core-graphics 0.24.0", "core-graphics 0.24.0",
"core-text", "core-text",
@ -2768,6 +2756,14 @@ dependencies = [
"foreign-types 0.5.0", "foreign-types 0.5.0",
"futures", "futures",
"gpui-macros", "gpui-macros",
"gpui_collections",
"gpui_http_client",
"gpui_media",
"gpui_refineable",
"gpui_semantic_version",
"gpui_sum_tree",
"gpui_util",
"gpui_util_macros",
"image", "image",
"inventory", "inventory",
"itertools 0.14.0", "itertools 0.14.0",
@ -2783,6 +2779,7 @@ dependencies = [
"parking", "parking",
"parking_lot", "parking_lot",
"pathfinder_geometry", "pathfinder_geometry",
"pin-project",
"postage", "postage",
"profiling", "profiling",
"rand 0.9.2", "rand 0.9.2",
@ -2811,20 +2808,11 @@ dependencies = [
"windows-core 0.61.2", "windows-core 0.61.2",
"windows-numerics", "windows-numerics",
"windows-registry 0.5.3", "windows-registry 0.5.3",
"workspace-hack",
"x11-clipboard", "x11-clipboard",
"x11rb", "x11rb",
"xkbcommon", "xkbcommon",
"zed-collections",
"zed-font-kit", "zed-font-kit",
"zed-http-client",
"zed-media",
"zed-refineable",
"zed-scap", "zed-scap",
"zed-semantic-version",
"zed-sum-tree",
"zed-util",
"zed-util-macros",
"zed-xim", "zed-xim",
] ]
@ -2907,15 +2895,168 @@ dependencies = [
[[package]] [[package]]
name = "gpui-macros" name = "gpui-macros"
version = "0.2.0" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "756549abfa9eef8391c685ae8a79a1a0e30b7d6e51f32cdce61998c689718710" checksum = "bcb02dd63a2859714ac7b6b476937617c3c744157af1b49f7c904023a79039be"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.105", "syn 2.0.105",
"workspace-hack", ]
[[package]]
name = "gpui_collections"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae39dc6d3d201be97e4bc08d96dbef2bc5b5c3d5734e05786e8cc3043342351c"
dependencies = [
"indexmap",
"rustc-hash 2.1.1",
]
[[package]]
name = "gpui_derive_refineable"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "644de174341a87b3478bd65b66bca38af868bcf2b2e865700523734f83cfc664"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.105",
]
[[package]]
name = "gpui_http_client"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23822b0a6d2c5e6a42507980a0ab3848610ea908942c8ef98187f646f690335e"
dependencies = [
"anyhow",
"async-compression",
"async-fs",
"bytes",
"derive_more",
"futures",
"gpui_util",
"http",
"http-body",
"log",
"parking_lot",
"serde",
"serde_json",
"sha2",
"tempfile",
"url",
"zed-async-tar",
"zed-reqwest",
]
[[package]]
name = "gpui_media"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05cb8912ae17371725132d2b7eec6797a255accc95d58ee5c1134b529810f14b"
dependencies = [
"anyhow",
"bindgen 0.71.1",
"core-foundation 0.10.0",
"core-video",
"ctor",
"foreign-types 0.5.0",
"metal",
"objc",
]
[[package]]
name = "gpui_perf"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40a0961dcf598955130e867f4b731150a20546427b41b1a63767c1037a86d77"
dependencies = [
"gpui_collections",
"serde",
"serde_json",
]
[[package]]
name = "gpui_refineable"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "258cb099254e9468181aee5614410fba61db4ae115fc1d51b4a0b985f60d6641"
dependencies = [
"gpui_derive_refineable",
]
[[package]]
name = "gpui_semantic_version"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201e45eff7b695528fb3af6560a534943fbc2db5323d755b9d198bd743948e35"
dependencies = [
"anyhow",
"serde",
]
[[package]]
name = "gpui_sum_tree"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4f3bedd573fafafa13d1200b356c588cf094fb2786e3684bb3f5ea59b549fa9"
dependencies = [
"arrayvec",
"log",
"rayon",
]
[[package]]
name = "gpui_util"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68faea25903ae524de9af83990b9aa51bcbc8dd085929ac0aea7fd41905e05c3"
dependencies = [
"anyhow",
"async-fs",
"async_zip",
"command-fds",
"dirs 4.0.0",
"dunce",
"futures",
"futures-lite 1.13.0",
"git2",
"globset",
"gpui_collections",
"gpui_util_macros",
"itertools 0.14.0",
"libc",
"log",
"nix 0.29.0",
"rand 0.9.2",
"regex",
"rust-embed",
"schemars",
"serde",
"serde_json",
"serde_json_lenient",
"shlex",
"smol",
"take-until",
"tempfile",
"tendril",
"unicase",
"walkdir",
"which",
]
[[package]]
name = "gpui_util_macros"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c28f65ef47fb97e21e82fd4dd75ccc2506eda010c846dc8054015ea234f1a22"
dependencies = [
"gpui_perf",
"quote",
"syn 2.0.105",
] ]
[[package]] [[package]]
@ -3537,7 +3678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e"
dependencies = [ dependencies = [
"cgl", "cgl",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"leaky-cow", "leaky-cow",
] ]
@ -4545,7 +4686,7 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
dependencies = [ dependencies = [
"proc-macro-crate 3.3.0", "proc-macro-crate 1.3.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.105", "syn 2.0.105",
@ -5817,7 +5958,6 @@ dependencies = [
"rustls", "rustls",
"rustls-platform-verifier", "rustls-platform-verifier",
"tokio", "tokio",
"zed-http-client",
"zed-reqwest", "zed-reqwest",
] ]
@ -6114,7 +6254,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
dependencies = [ dependencies = [
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"jni", "jni",
"log", "log",
@ -6299,7 +6439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c" checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
"security-framework-sys", "security-framework-sys",
@ -9476,26 +9616,17 @@ dependencies = [
] ]
[[package]] [[package]]
name = "zed-collections" name = "zed-async-tar"
version = "0.2.0" version = "0.5.0-zed"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec1b9b3b5d39c11198dda53dbd50e18fbcaebc854c7c62921bf444cb5f21ab8a" checksum = "6cf4b5f655e29700e473cb1acd914ab112b37b62f96f7e642d5fc6a0c02eb881"
dependencies = [ dependencies = [
"indexmap", "async-std",
"rustc-hash 2.1.1", "filetime",
"workspace-hack", "libc",
] "pin-project",
"redox_syscall 0.2.16",
[[package]] "xattr",
name = "zed-derive-refineable"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0438b07ec0b8965715363dd1096a28e2d758408b7d67d683510b57dc2d121210"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.105",
"workspace-hack",
] ]
[[package]] [[package]]
@ -9506,7 +9637,7 @@ checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"byteorder", "byteorder",
"core-foundation 0.10.1", "core-foundation 0.10.0",
"core-graphics 0.24.0", "core-graphics 0.24.0",
"core-text", "core-text",
"dirs 5.0.1", "dirs 5.0.1",
@ -9523,72 +9654,6 @@ dependencies = [
"yeslogic-fontconfig-sys", "yeslogic-fontconfig-sys",
] ]
[[package]]
name = "zed-http-client"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3f2bb8e91cfc16ef201813d76fa6c4e98e5193f07f88d51c7b912d3761f72f"
dependencies = [
"anyhow",
"async-compression",
"async-fs",
"async-tar",
"bytes",
"derive_more",
"futures",
"http",
"http-body",
"log",
"parking_lot",
"serde",
"serde_json",
"sha2",
"tempfile",
"url",
"workspace-hack",
"zed-reqwest",
"zed-util",
]
[[package]]
name = "zed-media"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b145013b2053b9b9bef788405815240e4d8648a3c8271ce9e49c7ef2384f48e7"
dependencies = [
"anyhow",
"bindgen 0.71.1",
"core-foundation 0.10.1",
"core-video",
"ctor",
"foreign-types 0.5.0",
"metal",
"objc",
"workspace-hack",
]
[[package]]
name = "zed-perf"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfdfdb2834f17691d64bbb21aa7b7dd2e933df9711c5c60874973254f37b335c"
dependencies = [
"serde",
"serde_json",
"workspace-hack",
"zed-collections",
]
[[package]]
name = "zed-refineable"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1898ca1f0e28bbe3fe1183899f79c083b646f8b8cea3ae52be6834ab29e0d656"
dependencies = [
"workspace-hack",
"zed-derive-refineable",
]
[[package]] [[package]]
name = "zed-reqwest" name = "zed-reqwest"
version = "0.12.15-zed" version = "0.12.15-zed"
@ -9664,17 +9729,6 @@ dependencies = [
"xcb", "xcb",
] ]
[[package]]
name = "zed-semantic-version"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "963eb3815502d03cdb116555e624baa87c286466cc2ad6b022ab5154d4032911"
dependencies = [
"anyhow",
"serde",
"workspace-hack",
]
[[package]] [[package]]
name = "zed-sum-tree" name = "zed-sum-tree"
version = "0.2.0" version = "0.2.0"
@ -9687,58 +9741,6 @@ dependencies = [
"workspace-hack", "workspace-hack",
] ]
[[package]]
name = "zed-util"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "989eeb4bc093333d33226f5a478d97d1d9b305fce5798bc89dd094768b4286b7"
dependencies = [
"anyhow",
"async-fs",
"async_zip",
"command-fds",
"dirs 4.0.0",
"dunce",
"futures",
"futures-lite 1.13.0",
"git2",
"globset",
"itertools 0.14.0",
"libc",
"log",
"nix 0.29.0",
"rand 0.9.2",
"regex",
"rust-embed",
"schemars",
"serde",
"serde_json",
"serde_json_lenient",
"shlex",
"smol",
"take-until",
"tempfile",
"tendril",
"unicase",
"walkdir",
"which",
"workspace-hack",
"zed-collections",
"zed-util-macros",
]
[[package]]
name = "zed-util-macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47eb0c78e38dfec0e59237f5cff5613a926c0262c3688ce070029ca3cc54fa63"
dependencies = [
"quote",
"syn 2.0.105",
"workspace-hack",
"zed-perf",
]
[[package]] [[package]]
name = "zed-xim" name = "zed-xim"
version = "0.4.0-zed" version = "0.4.0-zed"

View file

@ -16,9 +16,8 @@ gpui-component = { path = "crates/ui" }
gpui-component-macros = { path = "crates/macros", version = "0.3.0-preview1" } gpui-component-macros = { path = "crates/macros", version = "0.3.0-preview1" }
story = { path = "crates/story" } story = { path = "crates/story" }
gpui = "0.2.0" gpui = "0.2.2"
gpui-macros = "0.2.0" gpui-macros = "0.2.2"
http-client = { version = "0.2.0", package = "zed-http-client" }
reqwest = { version = "0.12.15-zed", package = "zed-reqwest" } reqwest = { version = "0.12.15-zed", package = "zed-reqwest" }
sum-tree = { version = "0.2.0", package = "zed-sum-tree" } sum-tree = { version = "0.2.0", package = "zed-sum-tree" }

View file

@ -16,8 +16,8 @@ path = "src/reqwest_client.rs"
doctest = true doctest = true
[dependencies] [dependencies]
gpui.workspace = true
reqwest.workspace = true reqwest.workspace = true
http-client.workspace = true
anyhow.workspace = true anyhow.workspace = true
log.workspace = true log.workspace = true

View file

@ -5,7 +5,7 @@ use std::{any::type_name, borrow::Cow, mem, pin::Pin, task::Poll, time::Duration
use anyhow::anyhow; use anyhow::anyhow;
use bytes::{BufMut, Bytes, BytesMut}; use bytes::{BufMut, Bytes, BytesMut};
use futures::{AsyncRead, FutureExt as _, TryStreamExt as _}; use futures::{AsyncRead, FutureExt as _, TryStreamExt as _};
use http_client::{RedirectPolicy, Url, http}; use gpui::http_client::{self, RedirectPolicy, Url, http};
use regex::Regex; use regex::Regex;
use reqwest::{ use reqwest::{
header::{HeaderMap, HeaderValue}, header::{HeaderMap, HeaderValue},
@ -298,7 +298,7 @@ impl http_client::HttpClient for ReqwestClient {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use http_client::{HttpClient, Url}; use gpui::http_client::{HttpClient, Url};
use crate::ReqwestClient; use crate::ReqwestClient;