Merge pull request #14 from dtolnay/serdederive

Drop dependency on serde's derive feature

.github/workflows/ci.yml

@@ -37,6 +37,7 @@ jobs:
         with:
           toolchain: ${{matrix.rust}}
       - run: cargo check --examples --workspace
+      - run: cargo check --examples --workspace --features serde/derive
       - run: cargo test --lib
       - run: cargo test --doc
 

Cargo.toml

@@ -19,7 +19,8 @@ indicatif = "0.17"
 memmap = "0.7"
 once_cell = "1.0"
 semver = { version = "1.0", features = ["serde"] }
-serde = { version = "1.0", features = ["derive"] }
+serde = "1.0"
+serde_derive = "1.0"
 serde_json = "1.0"
 tar = "0.4"
 

concat/Cargo.toml

@@ -21,5 +21,6 @@ csv = "1.1"
 flate2 = "1.0"
 glob = "0.3"
 memmap = "0.7"
-serde = { version = "1.0", features = ["derive"] }
+serde = "1.0"
+serde_derive = "1.0"
 tar = "0.4"

concat/main.rs

@@ -32,8 +32,9 @@ use flate2::read::GzDecoder;
 use flate2::write::GzEncoder;
 use flate2::Compression;
 use memmap::Mmap;
-use serde::de::{Unexpected, Visitor};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::de::{Deserializer, Unexpected, Visitor};
+use serde::ser::Serializer;
+use serde_derive::{Deserialize, Serialize};
 use std::cmp;
 use std::collections::BTreeMap as Map;
 use std::fmt;

src/badges.rs

@@ -4,7 +4,7 @@ use crate::crates::CrateId;
 use crate::error::{err, Result};
 use crate::load::FromRecord;
 use csv::StringRecord;
-use serde::Deserialize;
+use serde_derive::Deserialize;
 use std::collections::BTreeMap as Map;
 
 /// One row of **badges.csv**.

src/categories.rs

@@ -1,7 +1,7 @@
 //! <b style="font-variant:small-caps">categories.csv</b>
 
 use chrono::NaiveDateTime;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/crate_owners.rs

@@ -7,7 +7,7 @@ use crate::teams::TeamId;
 use crate::users::UserId;
 use chrono::NaiveDateTime;
 use csv::StringRecord;
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
 pub enum OwnerId {

src/crates.rs

@@ -1,7 +1,7 @@
 //! <b style="font-variant:small-caps">crates.csv</b>
 
 use chrono::NaiveDateTime;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/crates_categories.rs

@@ -2,7 +2,7 @@
 
 use crate::categories::CategoryId;
 use crate::crates::CrateId;
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 /// One row of **crates_categories.csv**.
 #[derive(Deserialize, Clone, Debug)]

src/crates_keywords.rs

@@ -2,7 +2,7 @@
 
 use crate::crates::CrateId;
 use crate::keywords::KeywordId;
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 /// One row of **crates_keywords.csv**.
 #[derive(Deserialize, Clone, Debug)]

src/dependencies.rs

@@ -3,8 +3,8 @@
 use crate::crates::CrateId;
 use crate::versions::VersionId;
 use semver::VersionReq;
-use serde::de::{Unexpected, Visitor};
-use serde::{Deserialize, Deserializer};
+use serde::de::{Deserialize, Deserializer, Unexpected, Visitor};
+use serde_derive::Deserialize;
 use std::fmt;
 
 /// One row of **dependencies.csv**.

src/keywords.rs

@@ -1,7 +1,7 @@
 //! <b style="font-variant:small-caps">keywords.csv</b>
 
 use chrono::NaiveDateTime;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/metadata.rs

@@ -1,6 +1,6 @@
 //! <b style="font-variant:small-caps">metadata.csv</b>
 
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 /// One row of **metadata.csv**.
 #[derive(Deserialize, Clone, Default, Debug)]

src/reserved_crate_names.rs

@@ -1,6 +1,6 @@
 //! <b style="font-variant:small-caps">reserved_crate_names.csv</b>
 
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 /// One row of **reserved_crate_names.csv**.
 #[derive(Deserialize, Clone, Debug)]

src/teams.rs

@@ -1,6 +1,6 @@
 //! <b style="font-variant:small-caps">teams.csv</b>
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/users.rs

@@ -1,6 +1,6 @@
 //! <b style="font-variant:small-caps">users.csv</b>
 
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/version_downloads.rs

@@ -2,7 +2,7 @@
 
 use crate::versions::VersionId;
 use chrono::NaiveDate;
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 /// One row of **version_downloads.csv**.
 #[derive(Deserialize, Clone, Debug)]

src/versions.rs

@@ -4,8 +4,8 @@ use crate::crates::CrateId;
 use crate::users::UserId;
 use chrono::NaiveDateTime;
 use semver::Version;
-use serde::de::{Unexpected, Visitor};
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::de::{Deserializer, Unexpected, Visitor};
+use serde_derive::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::collections::BTreeMap as Map;