move vanilla registry to registry crate

util/fmt/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "rimecraft-fmt"
+version = "0.1.0"
+edition = "2021"
+authors = ["JieningYu <[email protected]>"]
+description = "Minecraft formattings"
+repository = "https://github.com/rimecraft-rs/rimecraft/"
+license = "AGPL-3.0-or-later"
+categories = []
+
+[badges]
+maintenance = { status = "passively-maintained" }
+
+[dependencies]
+
+[lints]
+workspace = true

util/identifier/Cargo.toml

@@ -14,13 +14,11 @@ maintenance = { status = "passively-maintained" }
 [dependencies]
 serde = { version = "1.0", optional = true }
 rimecraft-edcode = { path = "../edcode", optional = true }
-rimecraft-registry = { path = "../registry", optional = true }
 
 [features]
 serde = ["dep:serde"]
 edcode = ["dep:rimecraft-edcode"]
 vanilla = []
-vanilla-registry = ["vanilla", "dep:rimecraft-registry"]
 
 [lints]
 workspace = true

util/registry/Cargo.toml

@@ -15,10 +15,14 @@ maintenance = { status = "passively-maintained" }
 parking_lot = "0.12"
 serde = { version = "1.0", optional = true }
 rimecraft-edcode = { path = "../edcode", optional = true }
+rimecraft-identifier = { path = "../identifier", optional = true, features = [
+    "vanilla",
+] }
 
 [features]
 serde = ["dep:serde"]
 edcode = ["dep:rimecraft-edcode"]
+vanilla-identifier = ["dep:rimecraft-identifier"]
 
 [lints]
 workspace = true

util/registry/src/key.rs

@@ -180,6 +180,7 @@ pub mod edcode {
         }
     }
 
+    /// Serde wrapper for registry reference keys.
     #[derive(Debug, Clone, Copy)]
     pub struct RegRef<T>(pub T);
 

util/registry/src/lib.rs

@@ -553,10 +553,14 @@ pub mod edcode {
 
     use crate::{ProvideRegistry, Reg};
 
+    /// Error type for `edcode` support.
     #[derive(Debug)]
     pub enum Error<K> {
+        /// Error for invalid key.
         InvalidKey(K),
+        /// Error for invalid raw id.
         InvalidRawId(usize),
+        /// Error for `VarI32`.
         VarI32(VarI32TooBigError),
     }
 
@@ -619,3 +623,18 @@ pub mod edcode {
 
 #[allow(dead_code)]
 type BoxedError = Box<dyn std::error::Error + Send + Sync>;
+
+#[cfg(feature = "vanilla-identifier")]
+impl crate::key::Root for rimecraft_identifier::vanilla::Identifier {
+    #[inline]
+    fn root() -> Self {
+        Self::new(
+            Default::default(),
+            rimecraft_identifier::vanilla::Path::new_unchecked("root"),
+        )
+    }
+}
+
+#[cfg(feature = "vanilla-registry")]
+#[doc("Registry using vanilla `Identifier`.")]
+pub type VanillaRegistry<T> = Registry<rimecraft_identifier::vanilla::Identifier, T>;