Skip to content

Commit 7fe162f

Browse files
committed
remove visit_string
1 parent 1c16a23 commit 7fe162f

File tree

1 file changed

+36
-26
lines changed

1 file changed

+36
-26
lines changed

src/aggregation/mod.rs

+36-26
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ use serde::{Deserialize, Deserializer, Serialize};
161161

162162
/// deserialize Option<f64> from string or float
163163
pub(crate) fn deserialize_option_f64<'de, D>(deserializer: D) -> Result<Option<f64>, D::Error>
164-
where D: Deserializer<'de> {
164+
where
165+
D: Deserializer<'de>,
166+
{
165167
struct StringOrFloatVisitor;
166168

167169
impl<'de> Visitor<'de> for StringOrFloatVisitor {
@@ -172,41 +174,46 @@ where D: Deserializer<'de> {
172174
}
173175

174176
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
175-
where E: de::Error {
176-
value.parse::<f64>().map(Some).map_err(|_err| {
177-
de::Error::custom(format!("Failed to parse f64 from string: {:?}", value))
178-
})
179-
}
180-
181-
fn visit_string<E>(self, value: String) -> Result<Self::Value, E>
182-
where E: de::Error {
177+
where
178+
E: de::Error,
179+
{
183180
value.parse::<f64>().map(Some).map_err(|_err| {
184181
de::Error::custom(format!("Failed to parse f64 from string: {:?}", value))
185182
})
186183
}
187184

188185
fn visit_f64<E>(self, value: f64) -> Result<Self::Value, E>
189-
where E: de::Error {
186+
where
187+
E: de::Error,
188+
{
190189
Ok(Some(value))
191190
}
192191

193192
fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
194-
where E: de::Error {
193+
where
194+
E: de::Error,
195+
{
195196
Ok(Some(value as f64))
196197
}
197198

198199
fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
199-
where E: de::Error {
200+
where
201+
E: de::Error,
202+
{
200203
Ok(Some(value as f64))
201204
}
202205

203206
fn visit_none<E>(self) -> Result<Self::Value, E>
204-
where E: de::Error {
207+
where
208+
E: de::Error,
209+
{
205210
Ok(None)
206211
}
207212

208213
fn visit_unit<E>(self) -> Result<Self::Value, E>
209-
where E: de::Error {
214+
where
215+
E: de::Error,
216+
{
210217
Ok(None)
211218
}
212219
}
@@ -216,7 +223,9 @@ where D: Deserializer<'de> {
216223

217224
/// deserialize f64 from string or float
218225
pub(crate) fn deserialize_f64<'de, D>(deserializer: D) -> Result<f64, D::Error>
219-
where D: Deserializer<'de> {
226+
where
227+
D: Deserializer<'de>,
228+
{
220229
struct StringOrFloatVisitor;
221230

222231
impl<'de> Visitor<'de> for StringOrFloatVisitor {
@@ -227,31 +236,32 @@ where D: Deserializer<'de> {
227236
}
228237

229238
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
230-
where E: de::Error {
231-
value.parse::<f64>().map_err(|_err| {
232-
de::Error::custom(format!("Failed to parse f64 from string: {:?}", value))
233-
})
234-
}
235-
236-
fn visit_string<E>(self, value: String) -> Result<Self::Value, E>
237-
where E: de::Error {
239+
where
240+
E: de::Error,
241+
{
238242
value.parse::<f64>().map_err(|_err| {
239243
de::Error::custom(format!("Failed to parse f64 from string: {:?}", value))
240244
})
241245
}
242246

243247
fn visit_f64<E>(self, value: f64) -> Result<Self::Value, E>
244-
where E: de::Error {
248+
where
249+
E: de::Error,
250+
{
245251
Ok(value)
246252
}
247253

248254
fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
249-
where E: de::Error {
255+
where
256+
E: de::Error,
257+
{
250258
Ok(value as f64)
251259
}
252260

253261
fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
254-
where E: de::Error {
262+
where
263+
E: de::Error,
264+
{
255265
Ok(value as f64)
256266
}
257267
}

0 commit comments

Comments
 (0)