Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Move `corgi-patches` into `tooling` (#64292)

Finn Evers31971937b5c4
diff --git a/Cargo.toml b/Cargo.toml
index c47feca207f..98bd4affd70 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1023,7 +1023,7 @@ webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev
# needs symlink support that Windows CI lacks). webrtc-sys is self-contained, so
# per-crate scratch dirs are sufficient. Upstream issue:
# https://github.com/dtolnay/cxx/issues/1752
-scratch = { path = "corgi-patches/scratch" }
+scratch = { path = "tooling/corgi/patches/scratch" }
[profile.dev]
split-debuginfo = "unpacked"
diff --git a/nix/build.nix b/nix/build.nix
index 8abca4066aa..a3608f58963 100644
--- a/nix/build.nix
+++ b/nix/build.nix
@@ -67,7 +67,6 @@ let
relPath = lib.removePrefix root path;
topLevelIncludes = [
"crates"
- "corgi-patches"
"assets"
"extensions"
"script"
@@ -81,7 +80,7 @@ let
builtins.elem firstComp topLevelIncludes;
corgiPatches = builtins.path {
- path = ../corgi-patches;
+ path = ../tooling/corgi/patches;
name = "corgi-patches";
};
craneLib = crane.overrideToolchain rustToolchain;
@@ -318,8 +317,9 @@ let
# `scratch` is a local dependency of `cxx-build`, so its API is needed
# while Crane builds third-party dependencies.
extraDummyScript = ''
- rm -rf $out/corgi-patches
- cp --recursive ${corgiPatches} $out/corgi-patches
+ rm -rf $out/tooling/corgi/patches
+ mkdir -p $out/tooling/corgi
+ cp --recursive ${corgiPatches} $out/tooling/corgi/patches
'';
};
}
diff --git a/corgi-patches/scratch/Cargo.toml b/tooling/corgi/patches/scratch/Cargo.toml
similarity index 100%
rename from corgi-patches/scratch/Cargo.toml
rename to tooling/corgi/patches/scratch/Cargo.toml
diff --git a/corgi-patches/scratch/LICENSE-APACHE b/tooling/corgi/patches/scratch/LICENSE-APACHE
similarity index 100%
rename from corgi-patches/scratch/LICENSE-APACHE
rename to tooling/corgi/patches/scratch/LICENSE-APACHE
diff --git a/corgi-patches/scratch/build.rs b/tooling/corgi/patches/scratch/build.rs
similarity index 100%
rename from corgi-patches/scratch/build.rs
rename to tooling/corgi/patches/scratch/build.rs
diff --git a/corgi-patches/scratch/src/lib.rs b/tooling/corgi/patches/scratch/src/lib.rs
similarity index 100%
rename from corgi-patches/scratch/src/lib.rs
rename to tooling/corgi/patches/scratch/src/lib.rs