Stop manually importing serde_derive (#118)

zmbush · Oct 8, 2019 · 5a83609 · 5a83609
1 parent 0c093b2
commit 5a83609
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,15 +11,14 @@ doc = false
 [dependencies]
 # Both
 budgetronlib = { path = "budgetronlib" }
-serde = "1.0.101"
+serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.40"
 
 # Library
 csv = "1.1.1"
 #data_store = { path = "data_store", optional = true }
 log = "0.4.8"
 regex = "1.3.1"
-serde_derive = "1.0.101"
 
 # Binary
 structopt = "0.3.2"

diff --git a/budgetronlib/Cargo.toml b/budgetronlib/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2018"
 
 [dependencies]
 chrono = "0.4.9"
-serde = "1.0.101"
-serde_derive = "1.0.101"
+serde = { version = "1.0.101", features = ["derive"] }
 toml = "0.5.3"
 csv = "1.1.1"
 dirs = "2.0.2"
diff --git a/budgetronlib/src/config.rs b/budgetronlib/src/config.rs
@@ -9,7 +9,7 @@
 use {
     crate::error::{BResult, BudgetError},
     serde::de::DeserializeOwned,
-    serde_derive::Deserialize,
+    serde::Deserialize,
     std::{collections::HashMap, env, fs::File, io::Read, path::PathBuf},
     toml,
 };

diff --git a/budgetronlib/src/fintime.rs b/budgetronlib/src/fintime.rs
@@ -10,7 +10,6 @@ use {
     self::Timeframe::*,
     chrono::{self, offset::TimeZone, Datelike},
     serde::{de, Deserialize, Deserializer, Serialize, Serializer},
-    serde_derive::Serialize,
     std::{fmt, ops},
 };
 

diff --git a/src/loading/alliant.rs b/src/loading/alliant.rs
@@ -12,7 +12,7 @@ use {
         money::Money,
     },
     budgetronlib::{error::BResult, fintime::Date},
-    serde_derive::Deserialize,
+    serde::Deserialize,
 };
 
 // "id","account_id","reference_id","transaction_type","amount","posted_at",

diff --git a/src/loading/generic.rs b/src/loading/generic.rs
@@ -9,7 +9,7 @@
 use {
     crate::loading::money::Money,
     budgetronlib::{error::BResult, fintime::Date},
-    serde_derive::{Deserialize, Serialize},
+    serde::{Deserialize, Serialize},
 };
 
 #[derive(Debug, Serialize, Copy, Deserialize, PartialEq, Clone, Eq, PartialOrd, Ord)]

diff --git a/src/loading/logix.rs b/src/loading/logix.rs
@@ -12,7 +12,7 @@ use {
         money::Money,
     },
     budgetronlib::{error::BResult, fintime::Date},
-    serde_derive::Deserialize,
+    serde::Deserialize,
 };
 
 #[derive(Debug, Deserialize)]

diff --git a/src/loading/mint.rs b/src/loading/mint.rs
@@ -12,7 +12,7 @@ use {
         money::Money,
     },
     budgetronlib::{error::BResult, fintime::Date},
-    serde_derive::Deserialize,
+    serde::Deserialize,
 };
 
 #[derive(Debug, Deserialize)]

diff --git a/src/processing/config.rs b/src/processing/config.rs
@@ -12,7 +12,7 @@ use {
         processing::{regex::Regex, Collate, RefundCollator, TransferCollator},
     },
     budgetronlib::error::BResult,
-    serde_derive::Deserialize,
+    serde::Deserialize,
     std::collections::HashMap,
 };
 

diff --git a/src/reporting/by_account.rs b/src/reporting/by_account.rs
@@ -11,7 +11,7 @@ use {
         loading::{Transaction, TransactionType},
         reporting::Reporter,
     },
-    serde_derive::Serialize,
+    serde::Serialize,
     serde_json::{self, Value},
     std::{borrow::Cow, fmt},
 };

diff --git a/src/reporting/by_timeframe.rs b/src/reporting/by_timeframe.rs
@@ -9,7 +9,7 @@
 use {
     crate::{loading::Transaction, reporting::Reporter},
     budgetronlib::fintime::{Date, Timeframe},
-    serde_derive::Serialize,
+    serde::Serialize,
     serde_json::{self, Value},
     std::{borrow::Cow, collections::BTreeMap, fmt},
 };

diff --git a/src/reporting/cashflow.rs b/src/reporting/cashflow.rs
@@ -11,7 +11,7 @@ use {
         loading::{Money, Transaction, TransactionType},
         reporting::{config::ReportOptions, timeseries::Timeseries, Reporter},
     },
-    serde_derive::Serialize,
+    serde::Serialize,
     serde_json::{self, Value},
     std::{borrow::Cow, fmt},
 };

diff --git a/src/reporting/categories.rs b/src/reporting/categories.rs
@@ -11,7 +11,7 @@ use {
         loading::{Money, Transaction, TransactionType},
         reporting::{config::ReportOptions, timeseries::Timeseries, Reporter},
     },
-    serde_derive::Serialize,
+    serde::Serialize,
     serde_json::{self, Value},
     std::{borrow::Cow, collections::HashMap},
 };

diff --git a/src/reporting/config.rs b/src/reporting/config.rs
@@ -12,7 +12,7 @@ use {
         reporting::{Cashflow, Categories, IncomeExpenseRatio, Reporter, RollingBudget},
     },
     budgetronlib::fintime::Date,
-    serde_derive::{Deserialize, Serialize},
+    serde::{Deserialize, Serialize},
     serde_json::{self, Value},
     std::{borrow::Cow, collections::HashMap},
 };

diff --git a/src/reporting/income_expense_ratio.rs b/src/reporting/income_expense_ratio.rs
@@ -11,7 +11,7 @@ use {
         loading::{Money, Transaction, TransactionType},
         reporting::Reporter,
     },
-    serde_derive::Serialize,
+    serde::Serialize,
     serde_json::{self, Value},
     std::{borrow::Cow, collections::HashMap},
 };

diff --git a/src/reporting/rolling_budget.rs b/src/reporting/rolling_budget.rs
@@ -12,7 +12,7 @@ use {
         reporting::{config::ReportOptions, timeseries::Timeseries, Reporter},
     },
     budgetronlib::fintime::Date,
-    serde_derive::{Deserialize, Serialize},
+    serde::{Deserialize, Serialize},
     serde_json::{self, Value},
     std::{borrow::Cow, collections::HashMap},
 };

diff --git a/src/reporting/timeseries.rs b/src/reporting/timeseries.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use {budgetronlib::fintime::Date, serde_derive::Serialize};
+use {budgetronlib::fintime::Date, serde::Serialize};
 
 #[derive(Debug, Serialize)]
 pub struct Timeseries<V>(Vec<TimeseriesDatum<V>>);