refactor(lib): unify serde and serde_derive using derive feature (#57)

orhun · Jan 31, 2022 · bedabc9 · bedabc9
1 parent d961b53
commit bedabc9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml
@@ -11,8 +11,7 @@ edition = "2021"
 
 [dependencies]
 thiserror = "1.0.30"
-serde = "1.0.130"
-serde_derive = "1.0.130"
+serde = { version = "1.0.130", features = ["derive"] }
 tera = "1.13.0"
 regex = "1.5.4"
 serde_regex = "1.1.0"

diff --git a/git-cliff-core/src/commit.rs b/git-cliff-core/src/commit.rs
@@ -16,7 +16,7 @@ use serde::ser::{
 };
 
 /// Common commit object that is parsed from a repository.
-#[derive(Debug, Clone, PartialEq, serde_derive::Deserialize)]
+#[derive(Debug, Clone, PartialEq, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Commit<'a> {
 	/// Commit ID.
@@ -35,9 +35,7 @@ pub struct Commit<'a> {
 }
 
 /// Object representing a link
-#[derive(
-	Debug, Clone, PartialEq, serde_derive::Deserialize, serde_derive::Serialize,
-)]
+#[derive(Debug, Clone, PartialEq, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Link {
 	/// Text of the link.

diff --git a/git-cliff-core/src/config.rs b/git-cliff-core/src/config.rs
@@ -2,7 +2,7 @@ use crate::error::Result;
 use regex::Regex;
 
 /// Configuration values.
-#[derive(Debug, Clone, serde_derive::Serialize, serde_derive::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Config {
 	/// Configuration values about changelog generation.
 	#[serde(default)]
@@ -13,9 +13,7 @@ pub struct Config {
 }
 
 /// Changelog configuration.
-#[derive(
-	Debug, Default, Clone, serde_derive::Serialize, serde_derive::Deserialize,
-)]
+#[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct ChangelogConfig {
 	/// Changelog header.
 	pub header: Option<String>,
@@ -28,9 +26,7 @@ pub struct ChangelogConfig {
 }
 
 /// Git configuration
-#[derive(
-	Debug, Default, Clone, serde_derive::Serialize, serde_derive::Deserialize,
-)]
+#[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct GitConfig {
 	/// Whether to enable parsing conventional commits.
 	pub conventional_commits:  Option<bool>,
@@ -57,7 +53,7 @@ pub struct GitConfig {
 }
 
 /// Parser for grouping commits.
-#[derive(Debug, Clone, serde_derive::Serialize, serde_derive::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct CommitParser {
 	/// Regex for matching the commit message.
 	#[serde(with = "serde_regex", default)]
@@ -74,7 +70,7 @@ pub struct CommitParser {
 }
 
 /// Parser for extracting links in commits.
-#[derive(Debug, Clone, serde_derive::Serialize, serde_derive::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct LinkParser {
 	/// Regex for finding links in the commit message.
 	#[serde(with = "serde_regex")]

diff --git a/git-cliff-core/src/release.rs b/git-cliff-core/src/release.rs
@@ -1,14 +1,7 @@
 use crate::commit::Commit;
 
 /// Representation of a release.
-#[derive(
-	Default,
-	Debug,
-	Clone,
-	PartialEq,
-	serde_derive::Serialize,
-	serde_derive::Deserialize,
-)]
+#[derive(Default, Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Release<'a> {
 	/// Release version, git tag.