Unnamed repository; edit this file 'description' to name the repository.
FIx incorrectly spelled cfg options (#10703)
* Fix incorrect cfg key for wasm32
* Fix unicode-lines cfg in helix-view not not being used
| -rw-r--r-- | helix-term/Cargo.toml | 2 | ||||
| -rw-r--r-- | helix-view/Cargo.toml | 1 | ||||
| -rw-r--r-- | helix-view/src/clipboard.rs | 4 | ||||
| -rw-r--r-- | 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 b00e9748..c34667ab 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 be0edc96..9dd8e3cc 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 8dd7ebb1..379accc7 100644 --- a/helix-view/src/clipboard.rs +++ b/helix-view/src/clipboard.rs @@ -90,13 +90,13 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> { } } -#[cfg(target_os = "wasm32")] +#[cfg(target_arch = "wasm32")] pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> { // 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<dyn ClipboardProvider> { 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 2e04037a..5540c518 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -386,7 +386,7 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> { }) } -#[cfg(not(any(windows, target_os = "wasm32")))] +#[cfg(not(any(windows, target_arch = "wasm32")))] pub fn get_terminal_provider() -> Option<TerminalConfig> { use helix_stdx::env::{binary_exists, env_var_is_set}; |