extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-01 07:35:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

taking local timezone as default

Browse Source
This commit is contained in:
Loïc Riegel 2025-04-04 18:26:43 +02:00
parent 3c75eb077d
commit f9b6b245b7
1 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,22 +690,18 @@ fn merge_record(record: &Record, head: Span, span: Span) -> Value {
}, },
}; };
let offset = match parse_timezone_from_record(record, &head, &span) { let offset: FixedOffset = match record.get("timezone") {
Some(timezone) => {
let offset = match parse_timezone_from_record(timezone, &head, &span) {
Ok(value) => value, Ok(value) => value,
Err(err) => { Err(err) => {
return err; return err;
} }
}; };
offset
dbg!(&year); }
dbg!(&month); None => now.offset().to_owned(),
dbg!(&day); };
dbg!(&hour);
dbg!(&minute);
dbg!(&second);
dbg!(&millisecond);
dbg!(&microsecond);
dbg!(&nanosecond);
let total_nanoseconds = nanosecond + microsecond * 1_000 + millisecond * 1_000_000; let total_nanoseconds = nanosecond + microsecond * 1_000 + millisecond * 1_000_000;
@ -792,12 +788,11 @@ fn parse_value_from_record_as_u32(
} }
fn parse_timezone_from_record( fn parse_timezone_from_record(
record: &Record, timezone: &Value,
head: &Span, head: &Span,
span: &Span, span: &Span,
) -> Result<FixedOffset, Value> { ) -> Result<FixedOffset, Value> {
match record.get("timezone") { match timezone {
Some(val) => match val {
Value::String { val, internal_span } => { Value::String { val, internal_span } => {
let offset: FixedOffset = match val.parse() { let offset: FixedOffset = match val.parse() {
Ok(offset) => offset, Ok(offset) => offset,
@ -823,8 +818,6 @@ fn parse_timezone_from_record(
}, },
*span, *span,
)), )),
},
None => Ok(FixedOffset::east_opt(0).expect("Should never fail")),
} }
} }