220b105efb
# Description
While perusing Value.rs, I noticed the `Value::int()`, `Value::float()`,
`Value::boolean()` and `Value::string()` constructors, which seem
designed to make it easier to construct various Values, but which aren't
used often at all in the codebase. So, using a few find-replaces
regexes, I increased their usage. This reduces overall LOC because
structures like this:
```
Value::Int {
val: a,
span: head
}
```
are changed into
```
Value::int(a, head)
```
and are respected as such by the project's formatter.
There are little readability concerns because the second argument to all
of these is `span`, and it's almost always extremely obvious which is
the span at every callsite.
# User-Facing Changes
None.
# 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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# 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.
102 lines
2.8 KiB
Rust
102 lines
2.8 KiB
Rust
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct StrJoin;
|
|
|
|
impl Command for StrJoin {
|
|
fn name(&self) -> &str {
|
|
"str join"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("str join")
|
|
.input_output_types(vec![(Type::List(Box::new(Type::String)), Type::String)])
|
|
.optional(
|
|
"separator",
|
|
SyntaxShape::String,
|
|
"optional separator to use when creating string",
|
|
)
|
|
.category(Category::Strings)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Concatenate multiple strings into a single string, with an optional separator between each"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["collect", "concatenate"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let separator: Option<String> = call.opt(engine_state, stack, 0)?;
|
|
|
|
let config = engine_state.get_config();
|
|
|
|
// let output = input.collect_string(&separator.unwrap_or_default(), &config)?;
|
|
// Hmm, not sure what we actually want. If you don't use debug_string, Date comes out as human readable
|
|
// which feels funny
|
|
let mut strings: Vec<String> = vec![];
|
|
|
|
for value in input {
|
|
match value {
|
|
Value::Error { error } => {
|
|
return Err(error);
|
|
}
|
|
value => {
|
|
strings.push(value.debug_string("\n", config));
|
|
}
|
|
}
|
|
}
|
|
|
|
let output = if let Some(separator) = separator {
|
|
strings.join(&separator)
|
|
} else {
|
|
strings.join("")
|
|
};
|
|
|
|
Ok(Value::String {
|
|
val: output,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Create a string from input",
|
|
example: "['nu', 'shell'] | str join",
|
|
result: Some(Value::string("nushell", Span::test_data())),
|
|
},
|
|
Example {
|
|
description: "Create a string from input with a separator",
|
|
example: "['nu', 'shell'] | str join '-'",
|
|
result: Some(Value::string("nu-shell", Span::test_data())),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(StrJoin {})
|
|
}
|
|
}
|