Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace time with std::time in components/net (#31079)

Browse source 
* Replace time with std::time in components/net

Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com>

* Fix cookie::test_sort_order test

Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com>

---------

Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com>
This commit is contained in:
Taym Haddadi 2024-01-17 15:18:20 +01:00 • committed by GitHub
parent d86e713a9c
commit 580062228b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 161 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/hyper_serde/lib.rs
View file

@ -20,7 +20,7 @@
//! * `hyper::Method`
//! * `hyper::Uri`
//! * `mime::Mime`
//! * `time::Tm`
//! * `std::time::SystemTime`
//!
//! # How do I use a data type with a `HeaderMap` member with Serde?
//!
@ -66,8 +66,10 @@
use std::ops::{Deref, DerefMut};
use std::str::FromStr;
use std::time::SystemTime;
use std::{cmp, fmt, str};
use chrono::{DateTime, SecondsFormat, Utc};
use cookie::Cookie;
use headers::ContentType;
use http::HeaderMap;
@ -78,7 +80,6 @@ use serde::de::{self, Error, MapAccess, SeqAccess, Visitor};
use serde::ser::{SerializeMap, SerializeSeq};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_bytes::{ByteBuf, Bytes};
use time::{strptime, Tm};
/// Deserialises a `T` value with a given deserializer.
///
@ -604,15 +605,15 @@ impl<'de> Visitor<'de> for StatusVisitor {
}
}
impl<'de> Deserialize<'de> for De<Tm> {
impl<'de> Deserialize<'de> for De<SystemTime> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
struct TmVisitor;
struct SystemTimeVisitor;
impl<'de> Visitor<'de> for TmVisitor {
type Value = De<Tm>;
impl<'de> Visitor<'de> for SystemTimeVisitor {
type Value = De<SystemTime>;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(formatter, "a date and time according to RFC 3339")
@ -622,22 +623,23 @@ impl<'de> Deserialize<'de> for De<Tm> {
where
E: de::Error,
{
strptime(v, "%Y-%m-%dT%H:%M:%SZ")
.map(De::new)
DateTime::parse_from_rfc3339(v)
.map(|t| De::new(SystemTime::from(t)))
.map_err(|e| E::custom(e.to_string()))
}
}
deserializer.deserialize_string(TmVisitor)
deserializer.deserialize_string(SystemTimeVisitor)
}
}
impl<'a> Serialize for Ser<'a, Tm> {
impl<'a> Serialize for Ser<'a, SystemTime> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
serializer.serialize_str(&self.v.rfc3339().to_string())
let date_time: DateTime<Utc> = self.v.clone().into();
serializer.serialize_str(&date_time.to_rfc3339_opts(SecondsFormat::Secs, true))
}
}