Move mclib-protocol to main crate

ya7on · Feb 24, 2024 · 130fc57 · 130fc57
1 parent b05858d
commit 130fc57
Show file tree

Hide file tree

Showing 67 changed files with 13 additions and 2,453 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,18 +9,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[workspace]
-members = ["macros", "protocol"]
-
-[workspace.dependencies]
+[dependencies]
 mclib-macros = { path = "macros", version = "0.0.1" }
-mclib-protocol = { path = "protocol", version = "0.0.1" }
 
-darling = { version = "0.20.3" }
 flate2 = { version = "1.0.28" }
-syn = { version = "2.0.39" }
 uuid = { version = "1.5.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
-
-[dependencies]
-mclib-macros = { workspace = true }
-mclib-protocol = { workspace = true }
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-darling = { workspace = true }
-syn = { workspace = true }
+darling = { version = "0.20.3" }
+syn = { version = "2.0.39" }
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
diff --git a/protocol/src/chunk_format.rs b/protocol/src/chunk_format.rs
diff --git a/protocol/src/chunk_format/data_array.rs b/protocol/src/chunk_format/data_array.rs
diff --git a/protocol/src/chunk_format/palleted_container.rs b/protocol/src/chunk_format/palleted_container.rs
diff --git a/protocol/src/chunk_format/section.rs b/protocol/src/chunk_format/section.rs
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs