mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up TOML-to-Jiff conversion (#13028)

Browse source 
## Summary

Based on some feedback from the Jiff author (@BurntSushi).
This commit is contained in:
Charlie Marsh 2025-04-21 18:49:42 -04:00 • committed by GitHub
parent 2ba4edfbbe
commit 6130524585
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/uv-resolver/src/lock/export/pylock_toml.rs
View file

@ -4,9 +4,9 @@ use std::path::Path;
use std::str::FromStr;
use std::sync::Arc;
use jiff::civil::{DateTime, Time};
use jiff::civil::{Date, DateTime, Time};
use jiff::tz::{Offset, TimeZone};
use jiff::{civil, Timestamp};
use jiff::Timestamp;
use serde::Deserialize;
use toml_edit::{value, Array, ArrayOfTables, Item, Table};
use url::Url;
@ -1451,6 +1451,8 @@ where
let Some(datetime) = Option::<toml_edit::Datetime>::deserialize(deserializer)? else {
return Ok(None);
};
// If the date is omitted, we can't parse the datetime.
let Some(date) = datetime.date else {
return Err(serde::de::Error::custom("missing date"));
};
@ -1458,7 +1460,7 @@ where
let year = i16::try_from(date.year).map_err(serde::de::Error::custom)?;
let month = i8::try_from(date.month).map_err(serde::de::Error::custom)?;
let day = i8::try_from(date.day).map_err(serde::de::Error::custom)?;
let date = civil::date(year, month, day);
let date = Date::new(year, month, day).map_err(serde::de::Error::custom)?;
// If the timezone is omitted, assume UTC.
let tz = if let Some(offset) = datetime.offset {
@ -1479,14 +1481,13 @@ where
let minute = i8::try_from(time.minute).map_err(serde::de::Error::custom)?;
let second = i8::try_from(time.second).map_err(serde::de::Error::custom)?;
let nanosecond = i32::try_from(time.nanosecond).map_err(serde::de::Error::custom)?;
Time::constant(hour, minute, second, nanosecond)
Time::new(hour, minute, second, nanosecond).map_err(serde::de::Error::custom)?
} else {
Time::midnight()
};
let zoned = DateTime::from_parts(date, time)
.to_zoned(tz)
let timestamp = tz
.to_timestamp(DateTime::from_parts(date, time))
.map_err(serde::de::Error::custom)?;
let timestamp = zoned.timestamp();
Ok(Some(timestamp))
}