diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs index 28f2bde59d..57e1ed815d 100644 --- a/crates/nu-command/src/default_context.rs +++ b/crates/nu-command/src/default_context.rs @@ -188,6 +188,9 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState { // Strings bind_command! { + Ansi, + AnsiLink, + AnsiStrip, Char, Decode, Encode, @@ -250,9 +253,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState { // Platform #[cfg(feature = "os")] bind_command! { - Ansi, - AnsiLink, - AnsiStrip, Clear, Du, Input, diff --git a/crates/nu-command/src/platform/mod.rs b/crates/nu-command/src/platform/mod.rs index 25df4e0c59..ca23934ce1 100644 --- a/crates/nu-command/src/platform/mod.rs +++ b/crates/nu-command/src/platform/mod.rs @@ -1,4 +1,3 @@ -mod ansi; mod clear; mod dir_info; mod input; @@ -10,7 +9,6 @@ mod term; mod ulimit; mod whoami; -pub use ansi::{Ansi, AnsiLink, AnsiStrip}; pub use clear::Clear; pub use dir_info::{DirBuilder, DirInfo, FileInfo}; pub use input::Input; diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/strings/ansi/ansi_.rs similarity index 99% rename from crates/nu-command/src/platform/ansi/ansi_.rs rename to crates/nu-command/src/strings/ansi/ansi_.rs index 3016a6bdeb..7588de545a 100644 --- a/crates/nu-command/src/platform/ansi/ansi_.rs +++ b/crates/nu-command/src/strings/ansi/ansi_.rs @@ -909,7 +909,7 @@ fn build_ansi_hashmap(v: &[AnsiCode]) -> HashMap<&str, &str> { #[cfg(test)] mod tests { - use crate::platform::ansi::ansi_::Ansi; + use crate::strings::ansi::ansi_::Ansi; #[test] fn examples_work_as_expected() { @@ -920,7 +920,7 @@ mod tests { #[test] fn no_duplicate_short_names() { - use crate::platform::ansi::ansi_::CODE_LIST; + use crate::strings::ansi::ansi_::CODE_LIST; use std::collections::HashSet; let mut seen = HashSet::new(); @@ -943,7 +943,7 @@ mod tests { #[test] fn no_duplicate_long_names() { - use crate::platform::ansi::ansi_::CODE_LIST; + use crate::strings::ansi::ansi_::CODE_LIST; use std::collections::HashSet; let mut seen = HashSet::new(); diff --git a/crates/nu-command/src/platform/ansi/link.rs b/crates/nu-command/src/strings/ansi/link.rs similarity index 100% rename from crates/nu-command/src/platform/ansi/link.rs rename to crates/nu-command/src/strings/ansi/link.rs diff --git a/crates/nu-command/src/platform/ansi/mod.rs b/crates/nu-command/src/strings/ansi/mod.rs similarity index 100% rename from crates/nu-command/src/platform/ansi/mod.rs rename to crates/nu-command/src/strings/ansi/mod.rs diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/strings/ansi/strip.rs similarity index 100% rename from crates/nu-command/src/platform/ansi/strip.rs rename to crates/nu-command/src/strings/ansi/strip.rs diff --git a/crates/nu-command/src/strings/mod.rs b/crates/nu-command/src/strings/mod.rs index 06bb6f5e84..0c2f6df6c8 100644 --- a/crates/nu-command/src/strings/mod.rs +++ b/crates/nu-command/src/strings/mod.rs @@ -1,3 +1,4 @@ +mod ansi; mod base; mod char_; mod detect_columns; @@ -8,6 +9,7 @@ mod parse; mod split; mod str_; +pub use ansi::{Ansi, AnsiLink, AnsiStrip}; pub use base::{ DecodeBase32, DecodeBase32Hex, DecodeBase64, DecodeHex, EncodeBase32, EncodeBase32Hex, EncodeBase64, EncodeHex,