forked from extern/nushell
6cdfee3573
# Description As part of the refactor to split spans off of Value, this moves to using helper functions to create values, and using `.span()` instead of matching span out of Value directly. Hoping to get a few more helping hands to finish this, as there are a lot of commands to update :) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com> Co-authored-by: WindSoilder <windsoilder@outlook.com>
71 lines
2.0 KiB
Rust
71 lines
2.0 KiB
Rust
mod basename;
|
|
mod dirname;
|
|
mod exists;
|
|
mod expand;
|
|
mod join;
|
|
mod parse;
|
|
pub mod path_;
|
|
mod relative_to;
|
|
mod split;
|
|
mod r#type;
|
|
|
|
use std::path::Path as StdPath;
|
|
|
|
pub use basename::SubCommand as PathBasename;
|
|
pub use dirname::SubCommand as PathDirname;
|
|
pub use exists::SubCommand as PathExists;
|
|
pub use expand::SubCommand as PathExpand;
|
|
pub use join::SubCommand as PathJoin;
|
|
pub use parse::SubCommand as PathParse;
|
|
pub use path_::PathCommand as Path;
|
|
pub use r#type::SubCommand as PathType;
|
|
pub use relative_to::SubCommand as PathRelativeTo;
|
|
pub use split::SubCommand as PathSplit;
|
|
|
|
use nu_protocol::{ShellError, Span, Value};
|
|
|
|
#[cfg(windows)]
|
|
const ALLOWED_COLUMNS: [&str; 4] = ["prefix", "parent", "stem", "extension"];
|
|
#[cfg(not(windows))]
|
|
const ALLOWED_COLUMNS: [&str; 3] = ["parent", "stem", "extension"];
|
|
|
|
trait PathSubcommandArguments {}
|
|
|
|
fn operate<F, A>(cmd: &F, args: &A, v: Value, name: Span) -> Value
|
|
where
|
|
F: Fn(&StdPath, Span, &A) -> Value + Send + Sync + 'static,
|
|
A: PathSubcommandArguments + Send + Sync + 'static,
|
|
{
|
|
let span = v.span();
|
|
match v {
|
|
Value::String { val, .. } => cmd(StdPath::new(&val), span, args),
|
|
_ => handle_invalid_values(v, name),
|
|
}
|
|
}
|
|
|
|
fn handle_invalid_values(rest: Value, name: Span) -> Value {
|
|
Value::error(err_from_value(&rest, name), name)
|
|
}
|
|
|
|
fn err_from_value(rest: &Value, name: Span) -> ShellError {
|
|
match rest {
|
|
Value::Error { error, .. } => *error.clone(),
|
|
_ => {
|
|
if rest.is_nothing() {
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string, record or list".into(),
|
|
wrong_type: "nothing".into(),
|
|
dst_span: name,
|
|
src_span: rest.span(),
|
|
}
|
|
} else {
|
|
ShellError::PipelineMismatch {
|
|
exp_input_type: "string, row or list".into(),
|
|
dst_span: name,
|
|
src_span: rest.span(),
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|