refactor(features): rm all optional deps and features

Author: zjp-CN

Cargo.toml

@@ -13,31 +13,23 @@ exclude     = [
               ]
 
 [dependencies]
-chrono  = {version = "0.4",     optional = true}
-lazy_static = {version = "1",   optional = true}
-miniz_oxide = {version = "0.7", optional = true}
+chrono  = {version = "0.4" }
+lazy_static = {version = "1" }
+miniz_oxide = {version = "0.7" }
 
 # anyhow = "1"
 thiserror = "1"
-log = {version = "0.4", optional = true}
+log = {version = "0.4" }
 
 [dependencies.serde]
 version  = "1"
-optional = true
 features = ["derive"]
 # default-features = false
 
 [dependencies.encoding_rs]
 version  = "0.8"
-optional = true
 features = ["fast-gb-hanzi-encode"]
 
-[features]
-default = ["full"]
-full    = ["file", "tcp", "encoding_rs", "chrono"]
-tcp     = ["miniz_oxide", "lazy_static", "serde", "log"]
-file    = []
-
 [dev-dependencies]
 # backtrace 是在 cargo test 无法并行的情况下 用于产生 test name （从而产生 snapshot name ）
 insta = "1"

rustdx-cmd/Cargo.toml

@@ -15,62 +15,32 @@ exclude     = [
 
 [dependencies]
 anyhow   = "1"
-argh     = {version = "0.1" , optional = true}
-calamine = {version = "0.19", optional = true}
-futures  = {version = "0.3" , optional = true}
-tokio    = {version = "1", features = ["rt-multi-thread", "macros"]   , optional = true}
-# rustdx   = {path    = "../" , optional = true}
-reqwest  = {version = "0.11", optional = true}
-bytes    = {version = "1.1" , optional = true}
-csv      = {version = "1.1" , optional = true}
-log      = {version = "0.4" , optional = true}
-chrono   = {version = "0.4" , optional = true}
-serde_json  = {version = "1", optional = true}
-lazy_static = {version = "1", optional = true}
-mini-redis  = {version = "0.4", optional = true}
-subprocess  = {version = "0.2", optional = true}
-simplelog   = {version ="0.12", optional = true}
-miniz_oxide = {version ="0.7", optional = true}
+argh     = {version = "0.1" }
+calamine = {version = "0.19"}
+futures  = {version = "0.3" }
+tokio    = {version = "1", features = ["rt-multi-thread", "macros"]   }
+# rustdx   = {path    = "../" }
+reqwest  = {version = "0.11"}
+bytes    = {version = "1.1" }
+csv      = {version = "1.1" }
+log      = {version = "0.4" }
+chrono   = {version = "0.4" }
+serde_json  = {version = "1"}
+lazy_static = {version = "1"}
+mini-redis  = {version = "0.4"}
+subprocess  = {version = "0.2"}
+simplelog   = {version ="0.12"}
+miniz_oxide = {version ="0.7"}
 
 [dependencies.rustdx]
 version  = "0.3.0"
-optional = true
 path = "../"
-default-features = false
-features = ["serde", "file"]
 
 [dependencies.serde]
 version  = "1"
-optional = true
 features = ["derive"]
 
-[features]
-default = ["bin"]
-bin = ["rustdx", "tokio/rt",  "tokio/rt-multi-thread", "futures", "argh", "calamine", "lazy_static", "reqwest", "csv", "subprocess", "reqwest/json", "serde", "serde_json", "chrono"]
-excel = ["calamine", "reqwest", "tokio/rt",  "tokio/rt-multi-thread", "futures"]
-clickhouse = ["tokio/macros", "tokio/sync", "csv"]
-
 [[bin]]
 name = "rustdx"
 path = "src/main.rs"
-required-features = ["bin"]
-
-[[example]]
-name = "excel"
-path = "examples/excel.rs"
-required-features = ["excel"]
-
-[[example]]
-name = "excel_and_online"
-path = "examples/excel_and_online.rs"
-required-features = ["excel"]
-
-[[example]]
-name = "clickhouse-cmd"
-path = "examples/clickhouse-cmd.rs"
-required-features = ["clickhouse"]
 
-[[example]]
-name = "tcp"
-path = "examples/tcp.rs"
-required-features = ["rustdx/tcp"]

rustdx-cmd/examples/excel.rs

@@ -44,7 +44,8 @@ enum Exchange {
     Szse,
 }
 
-fn read_excel(path: &str, ex: Exchange) -> Result<Sheets> {
+type Reader = std::io::BufReader<std::fs::File>;
+fn read_excel(path: &str, ex: Exchange) -> Result<Sheets<Reader>> {
     let now = Instant::now();
     let mut workbook = open_workbook_auto(&path)?;
     println!(

src/bytes_helper.rs

@@ -47,15 +47,13 @@ pub fn date_string(x: u32) -> String {
     format!("{}-{}{}-{}{}", y, fill(m), m, fill(d), d)
 }
 
-#[cfg(feature = "serde")]
 pub fn ser_date_string<S>(date: &u32, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: serde::Serializer,
 {
     serializer.serialize_str(&crate::bytes_helper::date_string(*date))
 }
 
-#[cfg(feature = "serde")]
 pub fn ser_code_string<S>(code: &u32, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: serde::Serializer,

src/file/day/fq.rs

@@ -6,8 +6,7 @@ use crate::{
 use std::path::Path;
 
 /// 注意：成交量的单位为 “手”，而不是股。在通达信和交易所数据里，单位为股。
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize))]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct Day {
     pub date: String,
     pub code: String,

src/file/day/mod.rs

@@ -1,6 +1,5 @@
 use std::path::Path;
 
-#[cfg(feature = "serde")]
 use {
     crate::bytes_helper::{ser_code_string, ser_date_string},
     serde::{Serialize, Serializer},
@@ -17,23 +16,21 @@ pub mod fq;
 /// 开启 `serde` feature 时，此结构体的序列化 (serialize) 时：
 /// 1. `date` 为 `年-月-日` 格式
 /// 2. `code` 为 6 位字符串的股票代码
-#[derive(Debug, Clone, Copy)]
-#[cfg_attr(feature = "serde", derive(Serialize))]
+#[derive(Debug, Clone, Copy, Serialize)]
 pub struct Day {
-    #[cfg_attr(feature = "serde", serde(serialize_with = "ser_date_string"))]
+    #[serde(serialize_with = "ser_date_string")]
     pub date: u32,
-    #[cfg_attr(feature = "serde", serde(serialize_with = "ser_code_string"))]
+    #[serde(serialize_with = "ser_code_string")]
     pub code: u32,
     pub open: f32,
     pub high: f32,
     pub low: f32,
     pub close: f32,
     pub amount: f32,
-    #[cfg_attr(feature = "serde", serde(serialize_with = "ser_vol"))]
+    #[serde(serialize_with = "ser_vol")]
     pub vol: u32,
 }
 
-#[cfg(feature = "serde")]
 fn ser_vol<S>(vol: &u32, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
@@ -97,7 +94,6 @@ impl Day {
     }
 
     /// chrono 格式的日期：用于某些序列化或者与时间相关的计算
-    #[cfg(feature = "chrono")]
     pub fn ymd(&self) -> chrono::naive::NaiveDate {
         let [y, m, d] = self.ymd_arr();
         chrono::naive::NaiveDate::from_ymd_opt(y as i32, m, d).unwrap()

src/file/gbbq/fq.rs

@@ -1,17 +1,15 @@
 use super::Gbbq;
 use crate::file::day::Day;
 
-#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
-#[derive(Debug, Clone)]
+#[derive(serde::Deserialize, Debug, Clone)]
 pub struct Factor {
     pub date: String,
     pub code: String,
-    #[cfg_attr(feature = "serde", serde(rename(deserialize = "close")))]
+    #[serde(rename(deserialize = "close"))]
     pub preclose: f64,
     pub factor: f64,
 }
 
-#[cfg(feature = "serde")]
 impl Factor {
     /// 根据前收、收盘价（最新价）和前一日的因子计算当日的复权因子。
     #[inline]

src/file/gbbq/mod.rs

@@ -13,14 +13,13 @@ pub type StockGbbq<'a> = HashMap<u32, Vec<Gbbq<'a>>>;
 /// ## 注意
 /// 开启 `serde` feature 时，此结构体的序列化 (serialize) 时：
 /// `date` 为 `年-月-日` 格式。
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize))]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct Gbbq<'a> {
     pub market: u8,
     /// 6 位股票代码
     pub code: &'a str,
     /// 日期
-    #[cfg_attr(feature = "serde", serde(serialize_with = "ser_date_string"))]
+    #[serde(serialize_with = "ser_date_string")]
     pub date: u32,
     /// 信息类型
     ///

src/file/lc/mod.rs

@@ -67,7 +67,6 @@ impl Lc {
 
     /// 转化成用于（反）序列化的数据类型：
     /// 6 位字符串的股票代码；%Y-%m-%d 字符串格式的日期；f64 类型的成交额；u64 类型的 vol 。
-    #[cfg(feature = "serde")]
     pub fn into_serde_type(self) -> LcSerde {
         LcSerde {
             datetime: self.datetime_string(),
@@ -105,7 +104,6 @@ impl Lc {
     }
 
     /// chrono 格式的日期：用于某些序列化或者与时间相关的计算
-    #[cfg(feature = "chrono")]
     pub fn datetime(&self) -> chrono::naive::NaiveDateTime {
         use chrono::naive::NaiveDate;
         const ERR: &str = "日期格式不对";
@@ -121,7 +119,6 @@ impl Lc {
 /// 用于序列化：比如写入到 csv
 ///
 /// 此结构体暂时待定，未来可能更改。
-#[cfg(feature = "serde")]
 #[derive(Debug, Clone, serde::Serialize)]
 pub struct LcSerde {
     /// `date` 为 `%Y-%m-%d H:M` 文本格式

src/lib.rs

@@ -5,10 +5,8 @@
 
 pub mod bytes_helper;
 
-#[cfg(feature = "file")]
 pub mod file;
 
-#[cfg(feature = "tcp")]
 pub mod tcp;
 
 use thiserror::Error;

src/tcp/basic.rs

@@ -115,7 +115,6 @@ impl SecurityList {
     }
 }
 
-#[cfg(feature = "encoding_rs")]
 impl Tdx for SecurityList {
     type Item = [SecurityListData];
 
@@ -176,7 +175,6 @@ impl SecurityListData {
     ///     reversed_bytes2,
     /// ) = struct.unpack("<6sH8s4sBI4s", bytes) # python 表示方式
     /// ```
-    #[cfg(feature = "encoding_rs")]
     pub fn parse(bytes: &[u8]) -> Self {
         let code = unsafe { std::str::from_utf8_unchecked(&bytes[0..6]) }.into();
         let (name, encoding_used, had_errors) = encoding_rs::GBK.decode(&bytes[8..16]);