🏗️ Combine boot crates.

celestia-island · Nov 16, 2024 · 549fec6 · 549fec6
1 parent 0437304
commit 549fec6
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 32 deletions.
diff --git a/packages/boot/Cargo.toml b/packages/boot/Cargo.toml
@@ -10,8 +10,7 @@ publish = false
 crate-type = ["rlib"]
 
 [dependencies]
-hikari-macro = { path = "../macro" }
-hikari-macro-types = { path = "../macro-types" }
+macros = { path = "../macros", package = "hikari-macros" }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/packages/boot/src/lib.rs b/packages/boot/src/lib.rs
@@ -1,2 +1,4 @@
-pub use hikari_macro::*;
-pub use hikari_macro_types::*;
+mod types;
+
+pub use macros::*;
+pub use types::*;
diff --git a/packages/macro-types/src/lib.rs → packages/boot/src/types/mod.rs b/packages/macro-types/src/lib.rs → packages/boot/src/types/mod.rs
diff --git a/packages/macro-types/src/register.rs → packages/boot/src/types/register.rs b/packages/macro-types/src/register.rs → packages/boot/src/types/register.rs
diff --git a/packages/macro-types/Cargo.toml b/packages/macro-types/Cargo.toml
diff --git a/packages/macro/Cargo.toml → packages/macros/Cargo.toml b/packages/macro/Cargo.toml → packages/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["langyo <[email protected]>"]
-name = "hikari-macro"
+name = "hikari-macros"
 
 version = "0.1.0"
 edition = "2021"
@@ -10,8 +10,6 @@ publish = false
 proc-macro = true
 
 [dependencies]
-hikari-macro-types = { path = "../macro-types" }
-
 anyhow = { workspace = true }
 derive_more = { workspace = true }
 

diff --git a/packages/macro/src/lib.rs → packages/macros/src/lib.rs b/packages/macro/src/lib.rs → packages/macros/src/lib.rs
diff --git a/packages/macro/src/utils/app.rs → packages/macros/src/utils/app.rs b/packages/macro/src/utils/app.rs → packages/macros/src/utils/app.rs
diff --git a/packages/macro/src/utils/mod.rs → packages/macros/src/utils/mod.rs b/packages/macro/src/utils/mod.rs → packages/macros/src/utils/mod.rs
diff --git a/packages/macro/src/utils/routes.rs → packages/macros/src/utils/routes.rs b/packages/macro/src/utils/routes.rs → packages/macros/src/utils/routes.rs