xtask: Remove transitive GPUI dependency (#47748)

Finn Evers created 1 week ago

Release Notes:

- N/A

Change summary

Cargo.lock                                           |  1 -
crates/extension/src/extension_builder.rs            |  2 +-
tooling/xtask/Cargo.toml                             |  1 -
tooling/xtask/src/tasks/workflows/extension_tests.rs | 13 +++++--------
4 files changed, 6 insertions(+), 11 deletions(-)

Detailed changes

Cargo.lock

@@ -20695,7 +20695,6 @@ dependencies = [
  "cargo_metadata",
  "cargo_toml",
  "clap",
- "extension",
  "gh-workflow",
  "indexmap",
  "indoc",

crates/extension/src/extension_builder.rs

@@ -19,7 +19,7 @@ use wasm_encoder::{ComponentSectionId, Encode as _, RawSection, Section as _};
 use wasmparser::Parser;
 
 /// Currently, we compile with Rust's `wasm32-wasip2` target, which works with WASI `preview2` and the component model.
-pub const RUST_TARGET: &str = "wasm32-wasip2";
+const RUST_TARGET: &str = "wasm32-wasip2";
 
 /// Compiling Tree-sitter parsers from C to WASM requires Clang 17, and a WASM build of libc
 /// and clang's runtime library. The `wasi-sdk` provides these binaries.

tooling/xtask/Cargo.toml

@@ -14,7 +14,6 @@ backtrace.workspace = true
 cargo_metadata.workspace = true
 cargo_toml.workspace = true
 clap = { workspace = true, features = ["derive"] }
-extension.workspace = true
 toml.workspace = true
 indoc.workspace = true
 indexmap.workspace = true

tooling/xtask/src/tasks/workflows/extension_tests.rs

@@ -10,6 +10,9 @@ use crate::tasks::workflows::{
 
 pub(crate) const ZED_EXTENSION_CLI_SHA: &str = "7cfce605704d41ca247e3f84804bf323f6c6caaf";
 
+// This should follow the set target in crates/extension/src/extension_builder.rs
+const EXTENSION_RUST_TARGET: &str = "wasm32-wasip2";
+
 // This is used by various extensions repos in the zed-extensions org to run automated tests.
 pub(crate) fn extension_tests() -> Workflow {
     let should_check_rust = PathCondition::new("check_rust", r"^(Cargo.lock|Cargo.toml|.*\.rs)$");
@@ -33,10 +36,7 @@ pub(crate) fn extension_tests() -> Workflow {
         .add_env(("CARGO_INCREMENTAL", 0))
         .add_env(("ZED_EXTENSION_CLI_SHA", ZED_EXTENSION_CLI_SHA))
         .add_env(("RUSTUP_TOOLCHAIN", "stable"))
-        .add_env((
-            "CARGO_BUILD_TARGET",
-            extension::extension_builder::RUST_TARGET,
-        ))
+        .add_env(("CARGO_BUILD_TARGET", EXTENSION_RUST_TARGET))
         .map(|workflow| {
             jobs.into_iter()
                 .chain([tests_pass])
@@ -47,10 +47,7 @@ pub(crate) fn extension_tests() -> Workflow {
 }
 
 fn install_rust_target() -> Step<Run> {
-    named::bash(format!(
-        "rustup target add {rust_target}",
-        rust_target = extension::extension_builder::RUST_TARGET
-    ))
+    named::bash(format!("rustup target add {EXTENSION_RUST_TARGET}",))
 }
 
 fn run_clippy() -> Step<Run> {