Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop dependency on serde's derive feature #14

Merged
merged 2 commits into from
Sep 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion concat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 3 additions & 2 deletions concat/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/badges.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
2 changes: 1 addition & 1 deletion src/categories.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/crate_owners.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/crates.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/crates_categories.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/crates_keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
4 changes: 2 additions & 2 deletions src/dependencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
2 changes: 1 addition & 1 deletion src/keywords.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/metadata.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/reserved_crate_names.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/teams.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/users.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/version_downloads.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
4 changes: 2 additions & 2 deletions src/versions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down