From 78697bb8cfa444304e80887d1ee86a51f279caab Mon Sep 17 00:00:00 2001 From: Antoine Stevan <44101798+amtoine@users.noreply.github.com> Date: Thu, 22 Jun 2023 23:45:54 +0200 Subject: [PATCH] move common tools from `nu-command` to `nu-cmd-base` (#9455) related to - https://github.com/nushell/nushell/pull/9404 # Description to support our cratification effort and moving non-1.0 commands outside of the main focus, this PR - creates a new `nu-cmd-base` crate to hold the common structs, traits and functions used by all command-related crates - to start the transition, moves the `input_handler` module from `nu-command` to `nu-cmd-base` # User-Facing Changes ``` $nothing ``` # Tests + Formatting - :green_circle: `toolkit fmt` - :green_circle: `toolkit clippy` - :black_circle: `toolkit test` - :black_circle: `toolkit test stdlib` # After Submitting ``` $nothing ``` --- Cargo.lock | 8 ++++++++ Cargo.toml | 1 + crates/nu-cmd-base/Cargo.toml | 13 +++++++++++++ .../src/input_handler.rs | 0 crates/nu-cmd-base/src/lib.rs | 1 + crates/nu-command/Cargo.toml | 1 + crates/nu-command/src/bytes/add.rs | 2 +- crates/nu-command/src/bytes/at.rs | 6 ++---- crates/nu-command/src/bytes/ends_with.rs | 2 +- crates/nu-command/src/bytes/index_of.rs | 2 +- crates/nu-command/src/bytes/length.rs | 2 +- crates/nu-command/src/bytes/remove.rs | 2 +- crates/nu-command/src/bytes/replace.rs | 2 +- crates/nu-command/src/bytes/reverse.rs | 2 +- crates/nu-command/src/bytes/starts_with.rs | 2 +- crates/nu-command/src/conversions/fill.rs | 2 +- crates/nu-command/src/conversions/fmt.rs | 2 +- crates/nu-command/src/conversions/into/binary.rs | 2 +- crates/nu-command/src/conversions/into/bool.rs | 2 +- crates/nu-command/src/conversions/into/datetime.rs | 2 +- crates/nu-command/src/conversions/into/decimal.rs | 2 +- crates/nu-command/src/conversions/into/filesize.rs | 2 +- crates/nu-command/src/conversions/into/int.rs | 2 +- crates/nu-command/src/conversions/into/string.rs | 2 +- crates/nu-command/src/hash/generic_digest.rs | 2 +- crates/nu-command/src/lib.rs | 1 - crates/nu-command/src/network/url/encode.rs | 2 +- crates/nu-command/src/platform/ansi/strip.rs | 2 +- .../nu-command/src/strings/encode_decode/base64.rs | 2 +- crates/nu-command/src/strings/encode_decode/hex.rs | 2 +- crates/nu-command/src/strings/format/filesize.rs | 2 +- crates/nu-command/src/strings/str_/case/mod.rs | 2 +- crates/nu-command/src/strings/str_/contains.rs | 2 +- crates/nu-command/src/strings/str_/distance.rs | 2 +- crates/nu-command/src/strings/str_/ends_with.rs | 2 +- crates/nu-command/src/strings/str_/index_of.rs | 2 +- crates/nu-command/src/strings/str_/length.rs | 2 +- crates/nu-command/src/strings/str_/replace.rs | 2 +- crates/nu-command/src/strings/str_/reverse.rs | 2 +- crates/nu-command/src/strings/str_/starts_with.rs | 2 +- crates/nu-command/src/strings/str_/substring.rs | 2 +- crates/nu-command/src/strings/str_/trim/trim_.rs | 2 +- 42 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 crates/nu-cmd-base/Cargo.toml rename crates/{nu-command => nu-cmd-base}/src/input_handler.rs (100%) create mode 100644 crates/nu-cmd-base/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index e344444b68..59efcb02ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2742,6 +2742,13 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "nu-cmd-base" +version = "0.81.1" +dependencies = [ + "nu-protocol", +] + [[package]] name = "nu-cmd-dataframe" version = "0.81.1" @@ -2840,6 +2847,7 @@ dependencies = [ "native-tls", "notify", "nu-ansi-term", + "nu-cmd-base", "nu-cmd-lang", "nu-color-config", "nu-engine", diff --git a/Cargo.toml b/Cargo.toml index 046789cf36..91463a0f8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ members = [ "crates/nu-engine", "crates/nu-parser", "crates/nu-system", + "crates/nu-cmd-base", "crates/nu-cmd-extra", "crates/nu-cmd-lang", "crates/nu-cmd-dataframe", diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml new file mode 100644 index 0000000000..b7e0280c08 --- /dev/null +++ b/crates/nu-cmd-base/Cargo.toml @@ -0,0 +1,13 @@ +[package] +authors = ["The Nushell Project Developers"] +description = "The foundation tools to build Nushell commands." +edition = "2021" +license = "MIT" +name = "nu-cmd-base" +repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base" +version = "0.81.1" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +nu-protocol = { version = "0.81.1", path = "../nu-protocol" } diff --git a/crates/nu-command/src/input_handler.rs b/crates/nu-cmd-base/src/input_handler.rs similarity index 100% rename from crates/nu-command/src/input_handler.rs rename to crates/nu-cmd-base/src/input_handler.rs diff --git a/crates/nu-cmd-base/src/lib.rs b/crates/nu-cmd-base/src/lib.rs new file mode 100644 index 0000000000..132fd33ded --- /dev/null +++ b/crates/nu-cmd-base/src/lib.rs @@ -0,0 +1 @@ +pub mod input_handler; diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index 9154cebf3b..7f9b7f0d11 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -95,6 +95,7 @@ url = "2.2" uuid = { version = "1.3", features = ["v4"] } wax = { version = "0.5" } which = { version = "4.4", optional = true } +nu-cmd-base = { version = "0.81.1", path = "../nu-cmd-base" } [target.'cfg(windows)'.dependencies] winreg = "0.50" diff --git a/crates/nu-command/src/bytes/add.rs b/crates/nu-command/src/bytes/add.rs index dd129518ec..70f36069c3 100644 --- a/crates/nu-command/src/bytes/add.rs +++ b/crates/nu-command/src/bytes/add.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs index 89d9cb313a..e0ca09e7f7 100644 --- a/crates/nu-command/src/bytes/at.rs +++ b/crates/nu-command/src/bytes/at.rs @@ -1,7 +1,5 @@ -use crate::{ - input_handler::{operate, CmdArgument}, - util, -}; +use crate::util; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/bytes/ends_with.rs b/crates/nu-command/src/bytes/ends_with.rs index 9317ad9245..9f18f8606b 100644 --- a/crates/nu-command/src/bytes/ends_with.rs +++ b/crates/nu-command/src/bytes/ends_with.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/bytes/index_of.rs b/crates/nu-command/src/bytes/index_of.rs index a991864fea..078347af32 100644 --- a/crates/nu-command/src/bytes/index_of.rs +++ b/crates/nu-command/src/bytes/index_of.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{Command, EngineState, Stack}; diff --git a/crates/nu-command/src/bytes/length.rs b/crates/nu-command/src/bytes/length.rs index 9e00bc3771..bab8550a53 100644 --- a/crates/nu-command/src/bytes/length.rs +++ b/crates/nu-command/src/bytes/length.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/bytes/remove.rs b/crates/nu-command/src/bytes/remove.rs index 6d6dbc8a50..8780d14ece 100644 --- a/crates/nu-command/src/bytes/remove.rs +++ b/crates/nu-command/src/bytes/remove.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/bytes/replace.rs b/crates/nu-command/src/bytes/replace.rs index 090642c102..dc12d7e344 100644 --- a/crates/nu-command/src/bytes/replace.rs +++ b/crates/nu-command/src/bytes/replace.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/bytes/reverse.rs b/crates/nu-command/src/bytes/reverse.rs index 916f44c850..f6e58d72bd 100644 --- a/crates/nu-command/src/bytes/reverse.rs +++ b/crates/nu-command/src/bytes/reverse.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs index 4a936c1cf3..6490152822 100644 --- a/crates/nu-command/src/bytes/starts_with.rs +++ b/crates/nu-command/src/bytes/starts_with.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs index 58791b38e3..156c3fe201 100644 --- a/crates/nu-command/src/conversions/fill.rs +++ b/crates/nu-command/src/conversions/fill.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/fmt.rs b/crates/nu-command/src/conversions/fmt.rs index e717583491..fdbf961d5c 100644 --- a/crates/nu-command/src/conversions/fmt.rs +++ b/crates/nu-command/src/conversions/fmt.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs index 28f35fe67a..0cebb6a1e1 100644 --- a/crates/nu-command/src/conversions/into/binary.rs +++ b/crates/nu-command/src/conversions/into/binary.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/bool.rs b/crates/nu-command/src/conversions/into/bool.rs index 34546f25e1..ad81ddb344 100644 --- a/crates/nu-command/src/conversions/into/bool.rs +++ b/crates/nu-command/src/conversions/into/bool.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs index 8405dcb9c4..301ab2bf62 100644 --- a/crates/nu-command/src/conversions/into/datetime.rs +++ b/crates/nu-command/src/conversions/into/datetime.rs @@ -1,6 +1,6 @@ -use crate::input_handler::{operate, CmdArgument}; use crate::{generate_strftime_list, parse_date_from_string}; use chrono::{DateTime, FixedOffset, Local, TimeZone, Utc}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/conversions/into/decimal.rs b/crates/nu-command/src/conversions/into/decimal.rs index 90f80c4c38..04d7fba80b 100644 --- a/crates/nu-command/src/conversions/into/decimal.rs +++ b/crates/nu-command/src/conversions/into/decimal.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs index acc40d130d..1f89e89b21 100644 --- a/crates/nu-command/src/conversions/into/filesize.rs +++ b/crates/nu-command/src/conversions/into/filesize.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs index fa4718e989..7e5c8e7388 100644 --- a/crates/nu-command/src/conversions/into/int.rs +++ b/crates/nu-command/src/conversions/into/int.rs @@ -1,6 +1,6 @@ use chrono::{FixedOffset, TimeZone}; -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs index 8137146f52..8ede3f300f 100644 --- a/crates/nu-command/src/conversions/into/string.rs +++ b/crates/nu-command/src/conversions/into/string.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/hash/generic_digest.rs b/crates/nu-command/src/hash/generic_digest.rs index 93801c3892..b56f25c40d 100644 --- a/crates/nu-command/src/hash/generic_digest.rs +++ b/crates/nu-command/src/hash/generic_digest.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{Command, EngineState, Stack}; diff --git a/crates/nu-command/src/lib.rs b/crates/nu-command/src/lib.rs index de111da039..f825b7b641 100644 --- a/crates/nu-command/src/lib.rs +++ b/crates/nu-command/src/lib.rs @@ -15,7 +15,6 @@ mod generators; mod hash; mod help; pub mod hook; -mod input_handler; mod math; mod misc; mod network; diff --git a/crates/nu-command/src/network/url/encode.rs b/crates/nu-command/src/network/url/encode.rs index 0606d0990f..ca13ff5015 100644 --- a/crates/nu-command/src/network/url/encode.rs +++ b/crates/nu-command/src/network/url/encode.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs index a9ebe92508..54f2bdfabc 100644 --- a/crates/nu-command/src/platform/ansi/strip.rs +++ b/crates/nu-command/src/platform/ansi/strip.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::{ ast::Call, ast::CellPath, engine::Command, engine::EngineState, engine::Stack, Category, diff --git a/crates/nu-command/src/strings/encode_decode/base64.rs b/crates/nu-command/src/strings/encode_decode/base64.rs index 9a7256e167..d6f6a419d0 100644 --- a/crates/nu-command/src/strings/encode_decode/base64.rs +++ b/crates/nu-command/src/strings/encode_decode/base64.rs @@ -1,8 +1,8 @@ -use crate::input_handler::{operate as general_operate, CmdArgument}; use base64::{ alphabet, engine::general_purpose::NO_PAD, engine::general_purpose::PAD, engine::GeneralPurpose, Engine, }; +use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{EngineState, Stack}; diff --git a/crates/nu-command/src/strings/encode_decode/hex.rs b/crates/nu-command/src/strings/encode_decode/hex.rs index 56d8f997c7..3485dd95a9 100644 --- a/crates/nu-command/src/strings/encode_decode/hex.rs +++ b/crates/nu-command/src/strings/encode_decode/hex.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate as general_operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{EngineState, Stack}; diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs index 7cea48650f..df3b2bb949 100644 --- a/crates/nu-command/src/strings/format/filesize.rs +++ b/crates/nu-command/src/strings/format/filesize.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{Command, EngineState, Stack}; diff --git a/crates/nu-command/src/strings/str_/case/mod.rs b/crates/nu-command/src/strings/str_/case/mod.rs index 321ef66e45..0df18ec78f 100644 --- a/crates/nu-command/src/strings/str_/case/mod.rs +++ b/crates/nu-command/src/strings/str_/case/mod.rs @@ -22,7 +22,7 @@ pub use upcase::SubCommand as StrUpcase; use nu_engine::CallExt; -use crate::input_handler::{operate as general_operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument}; use nu_protocol::ast::{Call, CellPath}; use nu_protocol::engine::{EngineState, Stack}; use nu_protocol::{PipelineData, ShellError, Span, Value}; diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs index 5c34f7a906..284405d332 100644 --- a/crates/nu-command/src/strings/str_/contains.rs +++ b/crates/nu-command/src/strings/str_/contains.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/distance.rs b/crates/nu-command/src/strings/str_/distance.rs index 12af21c92f..695574dbdb 100644 --- a/crates/nu-command/src/strings/str_/distance.rs +++ b/crates/nu-command/src/strings/str_/distance.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/strings/str_/ends_with.rs b/crates/nu-command/src/strings/str_/ends_with.rs index 671a1c75ad..083b7c1966 100644 --- a/crates/nu-command/src/strings/str_/ends_with.rs +++ b/crates/nu-command/src/strings/str_/ends_with.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs index 6913b59974..678f9a803f 100644 --- a/crates/nu-command/src/strings/str_/index_of.rs +++ b/crates/nu-command/src/strings/str_/index_of.rs @@ -1,5 +1,5 @@ -use crate::input_handler::{operate, CmdArgument}; use crate::{grapheme_flags, util}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/strings/str_/length.rs b/crates/nu-command/src/strings/str_/length.rs index 46bab55103..78a90fc528 100644 --- a/crates/nu-command/src/strings/str_/length.rs +++ b/crates/nu-command/src/strings/str_/length.rs @@ -1,5 +1,5 @@ use crate::grapheme_flags; -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/replace.rs b/crates/nu-command/src/strings/str_/replace.rs index 17bd8d524e..f7d842fedc 100644 --- a/crates/nu-command/src/strings/str_/replace.rs +++ b/crates/nu-command/src/strings/str_/replace.rs @@ -1,5 +1,5 @@ -use crate::input_handler::{operate, CmdArgument}; use fancy_regex::{NoExpand, Regex}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath}, diff --git a/crates/nu-command/src/strings/str_/reverse.rs b/crates/nu-command/src/strings/str_/reverse.rs index 3a326ba321..22586be55e 100644 --- a/crates/nu-command/src/strings/str_/reverse.rs +++ b/crates/nu-command/src/strings/str_/reverse.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CellPathOnlyArgs}; +use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/starts_with.rs b/crates/nu-command/src/strings/str_/starts_with.rs index 31ab8bad78..e5077a208c 100644 --- a/crates/nu-command/src/strings/str_/starts_with.rs +++ b/crates/nu-command/src/strings/str_/starts_with.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs index 020358a407..180a690d92 100644 --- a/crates/nu-command/src/strings/str_/substring.rs +++ b/crates/nu-command/src/strings/str_/substring.rs @@ -1,5 +1,5 @@ -use crate::input_handler::{operate, CmdArgument}; use crate::{grapheme_flags, util}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::ast::CellPath; diff --git a/crates/nu-command/src/strings/str_/trim/trim_.rs b/crates/nu-command/src/strings/str_/trim/trim_.rs index 84624f0e29..6b7c8888d2 100644 --- a/crates/nu-command/src/strings/str_/trim/trim_.rs +++ b/crates/nu-command/src/strings/str_/trim/trim_.rs @@ -1,4 +1,4 @@ -use crate::input_handler::{operate, CmdArgument}; +use nu_cmd_base::input_handler::{operate, CmdArgument}; use nu_engine::CallExt; use nu_protocol::{ ast::{Call, CellPath},