From 8820d7b296ce347238fcb7abeadf2778f9779f81 Mon Sep 17 00:00:00 2001 From: Sam Scott Date: Fri, 1 Oct 2021 09:17:12 -0400 Subject: Update flatten workaround. --- Cargo.toml | 1 + src/lib.rs | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4a643d7..51c5355 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,7 @@ csv = "1.1" rand = "0.8" serde_derive = "1.0" serde_urlencoded = "0.7" +serde_with = "1.10" [features] default = [] diff --git a/src/lib.rs b/src/lib.rs index 4df1d00..f133278 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -111,16 +111,9 @@ //! #[macro_use] //! extern crate serde_derive; //! extern crate serde_qs as qs; +//! extern crate serde_with; //! -//! use serde::de::Error; -//! -//! fn from_str<'de, D, S>(deserializer: D) -> Result -//! where D: serde::Deserializer<'de>, -//! S: std::str::FromStr -//! { -//! let s = <&str as serde::Deserialize>::deserialize(deserializer)?; -//! S::from_str(&s).map_err(|_| D::Error::custom("could not parse string")) -//! } +//! use serde_with::rust::display_fromstr::deserialize as deserialize_fromstr; //! //! #[derive(Deserialize, Serialize, Debug, PartialEq)] //! struct Query { @@ -131,11 +124,11 @@ //! //! #[derive(Deserialize, Serialize, Debug, PartialEq)] //! struct CommonParams { -//! #[serde(deserialize_with="from_str")] +//! #[serde(deserialize_with="deserialize_fromstr")] //! limit: u64, -//! #[serde(deserialize_with="from_str")] +//! #[serde(deserialize_with="deserialize_fromstr")] //! offset: u64, -//! #[serde(deserialize_with="from_str")] +//! #[serde(deserialize_with="deserialize_fromstr")] //! remaining: bool, //! } //! -- cgit v1.2.3