extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

sort_by error processing return ShellError instead of static String (#4453)

Browse Source 
* sort_by error processing part I return ShellError instead of static Strings

* more explicit details on what types are failing

* clippy fixes
This commit is contained in:
Michael Angerman 2022-02-12 21:30:57 -08:00 committed by GitHub
parent 6fc082f6e9
commit e82ffc4dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/nu-command/src/filters/sort_by.rs
View File

@ -197,11 +197,13 @@ pub fn sort(
b.into_string("", config).to_ascii_lowercase(), b.into_string("", config).to_ascii_lowercase(),
Span::test_data(), Span::test_data(),
); );
coerce_compare(&lowercase_left, &lowercase_right) coerce_compare(&lowercase_left, &lowercase_right, call)
.expect("sort_by default bug") .expect("sort_by default bug")
.compare() .compare()
} else { } else {
coerce_compare(a, b).expect("sort_by default bug").compare() coerce_compare(a, b, call)
.expect("sort_by default bug")
.compare()
} }
}); });
} }
@ -216,7 +218,7 @@ pub fn process(
call: &Call, call: &Call,
insensitive: bool, insensitive: bool,
config: &Config, config: &Config,
) -> Result<CompareValues, (&'static str, &'static str)> { ) -> Result<CompareValues, ShellError> {
let left_value = left.get_data_by_key(column); let left_value = left.get_data_by_key(column);
let left_res = match left_value { let left_res = match left_value {
@ -240,9 +242,9 @@ pub fn process(
right_res.into_string("", config).to_ascii_lowercase(), right_res.into_string("", config).to_ascii_lowercase(),
Span::test_data(), Span::test_data(),
); );
coerce_compare(&lowercase_left, &lowercase_right) coerce_compare(&lowercase_left, &lowercase_right, call)
} else { } else {
coerce_compare(&left_res, &right_res) coerce_compare(&left_res, &right_res, call)
} }
} }
@ -281,7 +283,8 @@ pub fn process_floats(left: &f64, right: &f64) -> std::cmp::Ordering {
pub fn coerce_compare( pub fn coerce_compare(
left: &Value, left: &Value,
right: &Value, right: &Value,
) -> Result<CompareValues, (&'static str, &'static str)> { call: &Call,
) -> Result<CompareValues, ShellError> {
match (left, right) { match (left, right) {
(Value::Float { val: left, .. }, Value::Float { val: right, .. }) => { (Value::Float { val: left, .. }, Value::Float { val: right, .. }) => {
Ok(CompareValues::Floats(*left, *right)) Ok(CompareValues::Floats(*left, *right))
@ -301,7 +304,11 @@ pub fn coerce_compare(
(Value::Bool { val: left, .. }, Value::Bool { val: right, .. }) => { (Value::Bool { val: left, .. }, Value::Bool { val: right, .. }) => {
Ok(CompareValues::Booleans(*left, *right)) Ok(CompareValues::Booleans(*left, *right))
} }
_ => Err(("coerce_compare_left", "coerce_compare_right")),
_ => {
let description = format!("not able to compare {:?} with {:?}\n", left, right);
Err(ShellError::TypeMismatch(description, call.head))
}
} }
} }