diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml index a5f445ef30..9225472a55 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 c3299a8ffd..eb65e992a1 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 ddf55ceed9..78d3ad1068 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 e104ccb52b..5db841dbd1 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 5e7725b767..ff6524b253 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 5286f4574a..7396909299 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 e875b9d2b0..93010a0eec 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::*;