extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-31 07:08:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

use find instead of for loop

Browse Source
This commit is contained in:
Loïc Riegel 2025-03-30 18:18:54 +02:00
parent 259b19d4f7
commit ed73899ad4
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/nu-command/src/conversions/into/datetime.rs
View File

@ -497,21 +497,22 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
} }
fn merge_record(record: &Record, head: Span, span: Span) -> Value { fn merge_record(record: &Record, head: Span, span: Span) -> Value {
for key in record.columns() { if let Some(invalid_col) = record
if !ALLOWED_COLUMNS.contains(&key.as_str()) { .columns()
let allowed_cols = ALLOWED_COLUMNS.join(", "); .find(|key| !ALLOWED_COLUMNS.contains(&key.as_str()))
return Value::error(ShellError::UnsupportedInput { {
msg: format!( let allowed_cols = ALLOWED_COLUMNS.join(", ");
"Column '{key}' is not valid for a structured datetime. Allowed columns are: {allowed_cols}" return Value::error(ShellError::UnsupportedInput {
), msg: format!(
input: "value originates from here".into(), "Column '{invalid_col}' is not valid for a structured datetime. Allowed columns are: {allowed_cols}"
msg_span: head, ),
input_span: span input: "value originates from here".into(),
}, msg_span: head,
span, input_span: span
); },
} span,
} );
};
let nanosecond = match parse_value_from_record_as_u32("nanosecond", 0, record, &head, &span) { let nanosecond = match parse_value_from_record_as_u32("nanosecond", 0, record, &head, &span) {
Ok(value) => value, Ok(value) => value,
@ -698,7 +699,7 @@ fn parse_timezone_from_record(
Ok(offset) Ok(offset)
} }
other => { other => {
return Err(Value::error( Err(Value::error(
ShellError::OnlySupportsThisInputType { ShellError::OnlySupportsThisInputType {
exp_input_type: "string".to_string(), exp_input_type: "string".to_string(),
wrong_type: other.get_type().to_string(), wrong_type: other.get_type().to_string(),
@ -706,7 +707,7 @@ fn parse_timezone_from_record(
src_span: other.span(), src_span: other.span(),
}, },
*span, *span,
)); ))
} }
}, },
None => Ok(FixedOffset::east_opt(0).unwrap()), None => Ok(FixedOffset::east_opt(0).unwrap()),