forked from extern/nushell
remove random decimal
(#10342)
followup to - https://github.com/nushell/nushell/pull/9979 ## ⚠️ wait for just before 0.86 ⚠️ # Description after deprecation comes removal 😏 # User-Facing Changes `into decimal` is removed in favor of `into float` # Tests + Formatting # After Submitting
This commit is contained in:
parent
20ac30b6e2
commit
f77fe04425
@ -369,7 +369,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
|
|||||||
Random,
|
Random,
|
||||||
RandomBool,
|
RandomBool,
|
||||||
RandomChars,
|
RandomChars,
|
||||||
RandomDecimal,
|
|
||||||
RandomDice,
|
RandomDice,
|
||||||
RandomFloat,
|
RandomFloat,
|
||||||
RandomInt,
|
RandomInt,
|
||||||
|
@ -1,136 +0,0 @@
|
|||||||
use nu_engine::CallExt;
|
|
||||||
use nu_protocol::ast::Call;
|
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
||||||
use nu_protocol::{
|
|
||||||
Category, Example, PipelineData, Range, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
||||||
};
|
|
||||||
use rand::prelude::{thread_rng, Rng};
|
|
||||||
use std::cmp::Ordering;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct SubCommand;
|
|
||||||
|
|
||||||
impl Command for SubCommand {
|
|
||||||
fn name(&self) -> &str {
|
|
||||||
"random decimal"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
|
||||||
Signature::build("random decimal")
|
|
||||||
.input_output_types(vec![(Type::Nothing, Type::Float)])
|
|
||||||
.allow_variants_without_examples(true)
|
|
||||||
.optional("range", SyntaxShape::Range, "Range of values")
|
|
||||||
.category(Category::Random)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
|
||||||
"deprecated: Generate a random float within a range [min..max]."
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extra_usage(&self) -> &str {
|
|
||||||
"Use `random float` instead"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn search_terms(&self) -> Vec<&str> {
|
|
||||||
vec!["generate", "float"]
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run(
|
|
||||||
&self,
|
|
||||||
engine_state: &EngineState,
|
|
||||||
stack: &mut Stack,
|
|
||||||
call: &Call,
|
|
||||||
_input: PipelineData,
|
|
||||||
) -> Result<PipelineData, ShellError> {
|
|
||||||
nu_protocol::report_error_new(
|
|
||||||
engine_state,
|
|
||||||
&ShellError::GenericError(
|
|
||||||
"Deprecated command".into(),
|
|
||||||
"`random decimal` is deprecated and will be removed in 0.86.".into(),
|
|
||||||
Some(call.head),
|
|
||||||
Some("Use `random float instead".into()),
|
|
||||||
vec![],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
decimal(engine_state, stack, call)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
|
||||||
vec![
|
|
||||||
Example {
|
|
||||||
description: "Generate a default float value between 0 and 1",
|
|
||||||
example: "random decimal",
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
Example {
|
|
||||||
description: "Generate a random float less than or equal to 500",
|
|
||||||
example: "random decimal ..500",
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
Example {
|
|
||||||
description: "Generate a random float greater than or equal to 100000",
|
|
||||||
example: "random decimal 100000..",
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
Example {
|
|
||||||
description: "Generate a random float between 1.0 and 1.1",
|
|
||||||
example: "random decimal 1.0..1.1",
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn decimal(
|
|
||||||
engine_state: &EngineState,
|
|
||||||
stack: &mut Stack,
|
|
||||||
call: &Call,
|
|
||||||
) -> Result<PipelineData, ShellError> {
|
|
||||||
let span = call.head;
|
|
||||||
let range: Option<Range> = call.opt(engine_state, stack, 0)?;
|
|
||||||
|
|
||||||
let (min, max) = if let Some(r) = range {
|
|
||||||
if r.is_end_inclusive() {
|
|
||||||
(r.from.as_float()?, r.to.as_float()?)
|
|
||||||
} else if r.to.as_float()? >= 1.0 {
|
|
||||||
(r.from.as_float()?, r.to.as_float()? - 1.0)
|
|
||||||
} else {
|
|
||||||
(0.0, 0.0)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
(0.0, 1.0)
|
|
||||||
};
|
|
||||||
|
|
||||||
match min.partial_cmp(&max) {
|
|
||||||
Some(Ordering::Greater) => Err(ShellError::InvalidRange {
|
|
||||||
left_flank: min.to_string(),
|
|
||||||
right_flank: max.to_string(),
|
|
||||||
span,
|
|
||||||
}),
|
|
||||||
Some(Ordering::Equal) => Ok(PipelineData::Value(
|
|
||||||
Value::float(min, Span::new(64, 64)),
|
|
||||||
None,
|
|
||||||
)),
|
|
||||||
_ => {
|
|
||||||
let mut thread_rng = thread_rng();
|
|
||||||
let result: f64 = thread_rng.gen_range(min..max);
|
|
||||||
|
|
||||||
Ok(PipelineData::Value(
|
|
||||||
Value::float(result, Span::new(64, 64)),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_examples() {
|
|
||||||
use crate::test_examples;
|
|
||||||
|
|
||||||
test_examples(SubCommand {})
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,6 +1,5 @@
|
|||||||
mod bool;
|
mod bool;
|
||||||
mod chars;
|
mod chars;
|
||||||
mod decimal;
|
|
||||||
mod dice;
|
mod dice;
|
||||||
mod float;
|
mod float;
|
||||||
mod int;
|
mod int;
|
||||||
@ -10,7 +9,6 @@ mod uuid;
|
|||||||
|
|
||||||
pub use self::bool::SubCommand as RandomBool;
|
pub use self::bool::SubCommand as RandomBool;
|
||||||
pub use self::chars::SubCommand as RandomChars;
|
pub use self::chars::SubCommand as RandomChars;
|
||||||
pub use self::decimal::SubCommand as RandomDecimal;
|
|
||||||
pub use self::dice::SubCommand as RandomDice;
|
pub use self::dice::SubCommand as RandomDice;
|
||||||
pub use self::float::SubCommand as RandomFloat;
|
pub use self::float::SubCommand as RandomFloat;
|
||||||
pub use self::int::SubCommand as RandomInt;
|
pub use self::int::SubCommand as RandomInt;
|
||||||
|
Loading…
Reference in New Issue
Block a user