From 1c4be24fb73609f3583d1d3772399f86304a2f77 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 16 Aug 2023 10:19:20 +0300 Subject: [PATCH] Move gpui derives tests into gpui crate to avoid dependency cycles `cargo run` on Zed project leads to rust-analyzer evantually emitting `[ERROR project_model::workspace] cyclic deps: gpui_macros(Idx::(269)) -> gpui(Idx::(264)), alternative path: gpui(Idx::(264)) -> gpui_macros(Idx::(269))` error after loading the project. The PR fixes this by moving away the test to the "root" project. --- Cargo.lock | 1 - crates/{gpui_macros => gpui}/tests/test.rs | 0 crates/gpui_macros/Cargo.toml | 3 --- 3 files changed, 4 deletions(-) rename crates/{gpui_macros => gpui}/tests/test.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 1ff9981a6a..a0be9756bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3172,7 +3172,6 @@ dependencies = [ name = "gpui_macros" version = "0.1.0" dependencies = [ - "gpui", "proc-macro2", "quote", "syn 1.0.109", diff --git a/crates/gpui_macros/tests/test.rs b/crates/gpui/tests/test.rs similarity index 100% rename from crates/gpui_macros/tests/test.rs rename to crates/gpui/tests/test.rs diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml index 9ff340299b..9d1d232c95 100644 --- a/crates/gpui_macros/Cargo.toml +++ b/crates/gpui_macros/Cargo.toml @@ -13,6 +13,3 @@ doctest = false syn = "1.0" quote = "1.0" proc-macro2 = "1.0" - -[dev-dependencies] -gpui = { path = "../gpui" }