Merge pull request #285 from woshilapin/serde-derive

Configure 'serde' with 'derive' feature as documented

Cargo.toml

@@ -23,8 +23,7 @@ log = "0.4"
 pretty_assertions = "0.6.1"
 proj = { version = "0.9.3", optional = true }
 rust_decimal = "1.0.1"
-serde = "1"
-serde_derive = "1"
+serde = { version = "1", features = ["derive"] }
 structopt = "0.2"
 failure = "0.1.1"
 serde_json = "1"

src/apply_rules.rs

@@ -33,7 +33,7 @@ use failure::{format_err, ResultExt};
 use geo_types::Geometry as GeoGeometry;
 use lazy_static::lazy_static;
 use log::{info, warn};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::fs;
 use std::fs::File;

src/common_format.rs

@@ -27,7 +27,7 @@ use csv;
 use derivative::Derivative;
 use failure::{bail, format_err, ResultExt};
 use log::info;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::BTreeSet;
 use std::path;
 

src/gtfs/mod.rs

@@ -34,7 +34,7 @@ use crate::utils::*;
 use crate::Result;
 use derivative::Derivative;
 use log::info;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::fs::File;
 use std::path::Path;

src/gtfs/read.rs

@@ -31,7 +31,7 @@ use derivative::Derivative;
 use failure::{bail, format_err, ResultExt};
 use geo_types::{LineString, Point};
 use log::{info, warn};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::result::Result as StdResult;
 

src/gtfs/write.rs

@@ -30,7 +30,7 @@ use csv;
 use failure::ResultExt;
 use geo_types::Geometry as GeoGeometry;
 use log::{info, warn};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path;
 

src/kv1/read.rs

@@ -30,7 +30,7 @@ use geo_types::MultiPoint as GeoMultiPoint;
 use lazy_static::lazy_static;
 use log::info;
 use proj::Proj;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::result::Result as StdResult;
 
@@ -39,7 +39,6 @@ fn de_from_date_string<'de, D>(deserializer: D) -> StdResult<Date, D::Error>
 where
     D: serde::Deserializer<'de>,
 {
-    use serde::Deserialize;
     let s = String::deserialize(deserializer)?;
 
     NaiveDate::parse_from_str(&s, "%Y-%m-%d").map_err(serde::de::Error::custom)

src/merge_stop_areas.rs

@@ -26,7 +26,7 @@ use crate::utils::{Report, ReportType};
 use crate::Result;
 use csv;
 use failure::{bail, ResultExt};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path;

src/model.rs

@@ -23,7 +23,7 @@ use crate::{Error, Result};
 use chrono::NaiveDate;
 use derivative::Derivative;
 use failure::format_err;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::cmp;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::ops;

src/ntfs/mod.rs

@@ -31,7 +31,7 @@ use crate::utils::*;
 use crate::Result;
 use chrono::NaiveDateTime;
 use log::info;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::path;
 use tempdir;
 

src/ntfs/read.rs

@@ -26,7 +26,7 @@ use crate::utils::make_collection_with_id;
 use crate::Result;
 use failure::{bail, ensure, format_err, ResultExt};
 use log::{error, info, warn};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 impl From<Stop> for StopArea {

src/objects.rs

@@ -26,7 +26,7 @@ use chrono::NaiveDate;
 use derivative::Derivative;
 use geo_types::Geometry as GeoGeometry;
 use rust_decimal::Decimal;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::collections::BTreeSet;
 use std::hash::{Hash, Hasher};

src/read_utils.rs

@@ -21,7 +21,7 @@ use crate::utils::{add_prefix_to_collection, add_prefix_to_collection_with_id};
 use crate::Result;
 use failure::{format_err, ResultExt};
 use log::info;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use serde_json;
 use std::collections::{BTreeMap, BTreeSet};
 use std::fs::File;

src/transfers.rs

@@ -24,7 +24,7 @@ use crate::Result;
 use csv;
 use failure::ResultExt;
 use log::info;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 use std::collections::hash_map::Entry::*;
 use std::collections::BTreeSet;
 use std::collections::{HashMap, HashSet};

src/utils.rs

@@ -22,7 +22,7 @@ use failure::ResultExt;
 use geo_types;
 use log::{debug, error, info};
 use rust_decimal::Decimal;
-use serde_derive::Serialize;
+use serde::Serialize;
 use std::fs;
 use std::io::{Read, Write};
 use std::path;
@@ -393,7 +393,7 @@ mod tests {
     mod serde_currency {
         use super::super::*;
         use pretty_assertions::assert_eq;
-        use serde_derive::{Deserialize, Serialize};
+        use serde::{Deserialize, Serialize};
 
         #[derive(Debug, Serialize, Deserialize)]
         struct CurrencyCodeWrapper {
@@ -441,7 +441,7 @@ mod tests {
         use super::super::*;
         use pretty_assertions::assert_eq;
         use rust_decimal_macros::dec;
-        use serde_derive::{Deserialize, Serialize};
+        use serde::{Deserialize, Serialize};
 
         #[derive(Debug, Serialize, Deserialize)]
         struct DecimalWrapper {