From af8acba35321f305bcc7a88ecd8e2e8d3351538e Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 26 Mar 2025 22:36:47 -0400 Subject: [PATCH] Remove unneeded inline tables in `Cargo.toml`s (#27563) This PR removes some unneeded inline tables from our `Cargo.toml`s. Release Notes: - N/A --- crates/call/Cargo.toml | 4 ++-- crates/collab/Cargo.toml | 2 +- crates/livekit_client_macos/Cargo.toml | 6 ++--- crates/menu/Cargo.toml | 2 +- crates/recent_projects/Cargo.toml | 2 +- crates/remote_server/Cargo.toml | 2 +- .../patches/use-cross-platform-livekit.patch | 24 +++++++++---------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml index a5f445ef30a20db4d3a93588bc49e03ac832fc7c..9225472a55433ce39c8ce03f49e867c66ae183cd 100644 --- a/crates/call/Cargo.toml +++ b/crates/call/Cargo.toml @@ -43,10 +43,10 @@ telemetry.workspace = true util.workspace = true [target.'cfg(target_os = "macos")'.dependencies] -livekit_client_macos = { workspace = true } +livekit_client_macos.workspace = true [target.'cfg(not(target_os = "macos"))'.dependencies] -livekit_client = { workspace = true } +livekit_client.workspace = true [dev-dependencies] client = { workspace = true, features = ["test-support"] } diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index c3299a8ffd677a65c638e5d632357990c1a02d5e..eb65e992a1127cea5fcc7e845b841579bc5bc10a 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -115,7 +115,7 @@ notifications = { workspace = true, features = ["test-support"] } pretty_assertions.workspace = true project = { workspace = true, features = ["test-support"] } prompt_store.workspace = true -recent_projects = { workspace = true } +recent_projects.workspace = true release_channel.workspace = true remote = { workspace = true, features = ["test-support"] } remote_server.workspace = true diff --git a/crates/livekit_client_macos/Cargo.toml b/crates/livekit_client_macos/Cargo.toml index ddf55ceed96ee86257b750da0a5d86c7ed1630dc..78d3ad1068a925b60724979a3ca8066273042e1c 100644 --- a/crates/livekit_client_macos/Cargo.toml +++ b/crates/livekit_client_macos/Cargo.toml @@ -44,9 +44,9 @@ postage.workspace = true core-foundation.workspace = true [target.'cfg(all(not(target_os = "macos")))'.dependencies] -async-trait = { workspace = true } -collections = { workspace = true } -gpui = { workspace = true } +async-trait.workspace = true +collections.workspace = true +gpui.workspace = true livekit_api.workspace = true nanoid.workspace = true diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml index e104ccb52b5ee69225e5d5721a89de952d20bd7c..5db841dbd1aee19529def8c8ba6e817c0554ecfb 100644 --- a/crates/menu/Cargo.toml +++ b/crates/menu/Cargo.toml @@ -14,4 +14,4 @@ doctest = false [dependencies] gpui.workspace = true -serde = { workspace = true } +serde.workspace = true diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml index 5e7725b7677727a883ecb80b4079673eb3f5c7fa..ff6524b2536615fc1779650af8dbd297ae1e0b35 100644 --- a/crates/recent_projects/Cargo.toml +++ b/crates/recent_projects/Cargo.toml @@ -44,7 +44,7 @@ workspace.workspace = true zed_actions.workspace = true [dev-dependencies] -dap = { workspace = true } +dap.workspace = true editor = { workspace = true, features = ["test-support"] } language = { workspace = true, features = ["test-support"] } project = { workspace = true, features = ["test-support"] } diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml index 5286f4574a7aed5aa13d7f7d33f98a05a1f942e1..7396909299f1a84f9bcdcae70ac01bb70f76e06b 100644 --- a/crates/remote_server/Cargo.toml +++ b/crates/remote_server/Cargo.toml @@ -44,7 +44,7 @@ languages.workspace = true log.workspace = true lsp.workspace = true node_runtime.workspace = true -paths = { workspace = true } +paths.workspace = true project.workspace = true proto.workspace = true release_channel.workspace = true diff --git a/script/patches/use-cross-platform-livekit.patch b/script/patches/use-cross-platform-livekit.patch index e875b9d2b03fbf25ea66227ad36aabb0bd203292..93010a0eecb96f5186d373622ec11887aaf21eba 100644 --- a/script/patches/use-cross-platform-livekit.patch +++ b/script/patches/use-cross-platform-livekit.patch @@ -5,15 +5,15 @@ index 9ba10e56ba..bb69440691 100644 @@ -41,10 +41,10 @@ serde_derive.workspace = true telemetry.workspace = true util.workspace = true - + -[target.'cfg(target_os = "macos")'.dependencies] +[target.'cfg(any())'.dependencies] - livekit_client_macos = { workspace = true } - + livekit_client_macos.workspace = true + -[target.'cfg(not(target_os = "macos"))'.dependencies] +[target.'cfg(all())'.dependencies] - livekit_client = { workspace = true } - + livekit_client.workspace = true + [dev-dependencies] diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs index 5e212d35b7..a8f9e8f43e 100644 @@ -21,19 +21,19 @@ index 5e212d35b7..a8f9e8f43e 100644 +++ b/crates/call/src/call.rs @@ -1,13 +1,13 @@ pub mod call_settings; - + -#[cfg(target_os = "macos")] +#[cfg(any())] mod macos; - + -#[cfg(target_os = "macos")] +#[cfg(any())] pub use macos::*; - + -#[cfg(not(target_os = "macos"))] +#[cfg(all())] mod cross_platform; - + -#[cfg(not(target_os = "macos"))] +#[cfg(all())] pub use cross_platform::*; @@ -45,15 +45,15 @@ index 1d17cfa145..f845234987 100644 -#[cfg(target_os = "macos")] +#[cfg(any())] mod macos; - + -#[cfg(target_os = "macos")] +#[cfg(any())] pub use macos::*; - + -#[cfg(not(target_os = "macos"))] +#[cfg(all())] mod cross_platform; - + -#[cfg(not(target_os = "macos"))] +#[cfg(all())] pub use cross_platform::*;