forked from extern/nushell
644164fab3
# Description #8258 Math floor and ceil return int types rather than floats. # User-Facing Changes Before: ``` /home/rdevenney/projects/open_source/nushell〉[(3.14 | math ceil | describe), (3.14 | math floor | describe), (3 | math ceil | describe), (3 | math floor | describe)] ╭───┬───────╮ │ 0 │ float │ │ 1 │ float │ │ 2 │ int │ │ 3 │ int │ ╰───┴───────╯ ``` After: ``` /home/rdevenney/projects/open_source/nushell〉[(3.14 | math ceil | describe), (3.14 | math floor | describe), (3 | math ceil | describe), (3 | math floor | describe)] ╭───┬─────╮ │ 0 │ int │ │ 1 │ int │ │ 2 │ int │ │ 3 │ int │ ╰───┴─────╯ ``` # 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.
88 lines
2.3 KiB
Rust
88 lines
2.3 KiB
Rust
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Span, Type, Value};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"math ceil"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math ceil")
|
|
.input_output_types(vec![(Type::Number, Type::Int)])
|
|
.vectorizes_over_list(true)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Returns the ceil of a number (smallest integer greater than or equal to that number)"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["ceiling", "round up", "rounding", "integer"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| operate(value, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Apply the ceil function to a list of numbers",
|
|
example: "[1.5 2.3 -3.1] | math ceil",
|
|
result: Some(Value::List {
|
|
vals: vec![Value::test_int(2), Value::test_int(3), Value::test_int(-3)],
|
|
span: Span::test_data(),
|
|
}),
|
|
}]
|
|
}
|
|
}
|
|
|
|
fn operate(value: Value, head: Span) -> Value {
|
|
match value {
|
|
Value::Int { .. } => value,
|
|
Value::Float { val, span } => Value::Int {
|
|
val: val.ceil() as i64,
|
|
span,
|
|
},
|
|
Value::Error { .. } => value,
|
|
other => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"numeric".into(),
|
|
other.get_type().to_string(),
|
|
head,
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|