mirror of
https://github.com/nushell/nushell.git
synced 2025-05-14 19:54:38 +00:00
# Description Inspired by #7592 For brevity use `Value::test_{string,int,float,bool}` Includes fixes to commands that were abusing `Span::test_data` in their implementation. Now the call span is used where possible or the explicit `Span::unknonw` is used. ## Command fixes - Fix abuse of `Span::test_data()` in `query_xml` - Fix abuse of `Span::test_data()` in `term size` - Fix abuse of `Span::test_data()` in `seq date` - Fix two abuses of `Span::test_data` in `nu-cli` - Change `Span::test_data` to `Span::unknown` in `keybindings listen` - Add proper call span to `registry query` - Fix span use in `nu_plugin_query` - Fix span assignment in `select` - Use `Span::unknown` instead of `test_data` in more places ## Other - Use `Value::test_int`/`test_float()` consistently - More `test_string` and `test_bool` - Fix unused imports # User-Facing Changes Some commands may now provide more helpful spans for downstream use in errors
106 lines
2.8 KiB
Rust
106 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, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"bits or"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bits or")
|
|
.input_output_types(vec![(Type::Int, Type::Int)])
|
|
.vectorizes_over_list(true)
|
|
.required(
|
|
"target",
|
|
SyntaxShape::Int,
|
|
"target integer to perform bit or",
|
|
)
|
|
.category(Category::Bits)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Performs bitwise or for integers"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["logic or"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
let target: i64 = call.req(engine_state, stack, 0)?;
|
|
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| operate(value, target, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Apply bits or to two numbers",
|
|
example: "2 | bits or 6",
|
|
result: Some(Value::test_int(6)),
|
|
},
|
|
Example {
|
|
description: "Apply logical or to a list of numbers",
|
|
example: "[8 3 2] | bits or 2",
|
|
result: Some(Value::List {
|
|
vals: vec![Value::test_int(10), Value::test_int(3), Value::test_int(2)],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn operate(value: Value, target: i64, head: Span) -> Value {
|
|
match value {
|
|
Value::Int { val, span } => Value::Int {
|
|
val: val | target,
|
|
span,
|
|
},
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => value,
|
|
other => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"integer".into(),
|
|
other.get_type().to_string(),
|
|
head,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|