From 3c4889540e3558ca420a15a0f0a2a621964fc0e2 Mon Sep 17 00:00:00 2001 From: Christopher Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Tue, 7 May 2024 12:14:02 -0400 Subject: [PATCH] FIx incorrectly spelled cfg options (#10703) * Fix incorrect cfg key for wasm32 * Fix unicode-lines cfg in helix-view not not being used --- helix-term/Cargo.toml | 2 +- helix-view/Cargo.toml | 1 + helix-view/src/clipboard.rs | 4 ++-- helix-view/src/editor.rs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index b00e97488f2f..c34667ab3d0d 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -14,7 +14,7 @@ homepage.workspace = true [features] default = ["git"] -unicode-lines = ["helix-core/unicode-lines"] +unicode-lines = ["helix-core/unicode-lines", "helix-view/unicode-lines"] integration = ["helix-event/integration_test"] git = ["helix-vcs/git"] diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml index be0edc96e970..9dd8e3cc6c85 100644 --- a/helix-view/Cargo.toml +++ b/helix-view/Cargo.toml @@ -13,6 +13,7 @@ homepage.workspace = true [features] default = [] term = ["crossterm"] +unicode-lines = [] [dependencies] helix-stdx = { path = "../helix-stdx" } diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs index 8dd7ebb16819..379accc7e41a 100644 --- a/helix-view/src/clipboard.rs +++ b/helix-view/src/clipboard.rs @@ -90,13 +90,13 @@ pub fn get_clipboard_provider() -> Box { } } -#[cfg(target_os = "wasm32")] +#[cfg(target_arch = "wasm32")] pub fn get_clipboard_provider() -> Box { // TODO: Box::new(provider::FallbackProvider::new()) } -#[cfg(not(any(windows, target_os = "wasm32", target_os = "macos")))] +#[cfg(not(any(windows, target_arch = "wasm32", target_os = "macos")))] pub fn get_clipboard_provider() -> Box { use helix_stdx::env::{binary_exists, env_var_is_set}; use provider::command::is_exit_success; diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 2e04037a8998..5540c5182944 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -386,7 +386,7 @@ pub fn get_terminal_provider() -> Option { }) } -#[cfg(not(any(windows, target_os = "wasm32")))] +#[cfg(not(any(windows, target_arch = "wasm32")))] pub fn get_terminal_provider() -> Option { use helix_stdx::env::{binary_exists, env_var_is_set};