From 030ce9c822410fea745c8f25b68e54e682ee250b Mon Sep 17 00:00:00 2001
From: Serial <69764315+Serial-ATA@users.noreply.github.com>
Date: Fri, 2 Apr 2021 21:07:28 -0400
Subject: [PATCH] Remove separate macro crate

Signed-off-by: Serial <69764315+Serial-ATA@users.noreply.github.com>
---
 Cargo.toml                                      |  1 -
 audiotags-dev-macro/.gitignore                  | 11 -----------
 audiotags-dev-macro/Cargo.toml                  | 12 ------------
 src/lib.rs                                      |  4 +++-
 audiotags-dev-macro/src/lib.rs => src/macros.rs |  0
 5 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 audiotags-dev-macro/.gitignore
 delete mode 100644 audiotags-dev-macro/Cargo.toml
 rename audiotags-dev-macro/src/lib.rs => src/macros.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 2432b050..3f9eecca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ mp4ameta = {version = "0.9.1", optional = true}
 id3 = {version = "0.6.2", optional = true}
 mp3-duration = {version = "0.1.10", optional = true}
 thiserror = "1.0.24"
-audiotags-dev-macro = {path = "./audiotags-dev-macro", version = "0.1.4"}
 
 [features]
 default = ["tags", "duration"]
diff --git a/audiotags-dev-macro/.gitignore b/audiotags-dev-macro/.gitignore
deleted file mode 100644
index 671ef899..00000000
--- a/audiotags-dev-macro/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
diff --git a/audiotags-dev-macro/Cargo.toml b/audiotags-dev-macro/Cargo.toml
deleted file mode 100644
index 91656fe7..00000000
--- a/audiotags-dev-macro/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "audiotags-dev-macro"
-version = "0.1.4"
-authors = ["Tianyi <ShiTianyi2001@outlook.com>"]
-edition = "2018"
-description = "macros used during the development of audiotags"
-license = "MIT"
-repository = "https://github.com/TianyiShi2001/audiotags"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
diff --git a/src/lib.rs b/src/lib.rs
index 4bab6342..29eb84a4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,7 +40,8 @@
 	clippy::module_name_repetitions
 )]
 
-pub(crate) use audiotags_dev_macro::*;
+mod macros;
+pub use macros::*;
 
 pub mod anytag;
 pub use anytag::*;
@@ -58,6 +59,7 @@ pub mod types;
 pub use types::*;
 
 pub mod config;
+
 pub use config::Config;
 
 use std::convert::From;
diff --git a/audiotags-dev-macro/src/lib.rs b/src/macros.rs
similarity index 100%
rename from audiotags-dev-macro/src/lib.rs
rename to src/macros.rs