diff options
| -rw-r--r-- | Cargo.lock | 44 | ||||
| -rw-r--r-- | server/Cargo.toml | 2 | ||||
| -rw-r--r-- | server/src/data/mod.rs | 6 |
3 files changed, 37 insertions, 15 deletions
@@ -435,6 +435,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -626,7 +632,7 @@ dependencies = [ "rand 0.9.0-alpha.1", "serde", "serde_json", - "serde_yaml", + "serde_yml", "shlex", "tokio", "tokio-tungstenite", @@ -701,6 +707,12 @@ dependencies = [ ] [[package]] +name = "libyml" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e281a65eeba3d4503a2839252f86374528f9ceafe6fed97c1d3b52e1fb625c1" + +[[package]] name = "light-client" version = "0.1.0" dependencies = [ @@ -1192,16 +1204,20 @@ dependencies = [ ] [[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" +name = "serde_yml" +version = "0.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f" dependencies = [ "indexmap", "itoa", + "libyml", + "log", + "memchr", "ryu", "serde", - "unsafe-libyaml", + "serde_json", + "tempfile", ] [[package]] @@ -1285,6 +1301,18 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] name = "thiserror" version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1394,12 +1422,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/server/Cargo.toml b/server/Cargo.toml index 39b9ea1c..929f806d 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -13,7 +13,7 @@ tokio = { version = "1.38.0", features = ["full"] } serde_json = "1.0.120" tokio-tungstenite = "0.23.1" futures-util = "0.3.30" -serde_yaml = "0.9.34+deprecated" +serde_yml = "0.0.10" rand = "0.9.0-alpha.1" shlex = "1.3.0" clap = { version = "4.5.8", features = ["derive"] } diff --git a/server/src/data/mod.rs b/server/src/data/mod.rs index 0f1976b9..28347a25 100644 --- a/server/src/data/mod.rs +++ b/server/src/data/mod.rs @@ -136,7 +136,7 @@ fn data_dir() -> PathBuf { impl DataIndex { pub fn reload(&mut self) -> Result<()> { - *self = serde_yaml::from_reader(File::open(data_dir().join("index.yaml"))?)?; + *self = serde_yml::from_reader(File::open(data_dir().join("index.yaml"))?)?; Ok(()) } @@ -165,8 +165,8 @@ impl DataIndex { pub async fn generate(&self, spec: String) -> Result<Gamedata> { let (map, recipes) = spec.split_once("-").unwrap_or((spec.as_str(), "default")); - let map_in = serde_yaml::from_str(&self.read_map(map).await?)?; - let recipes_in = serde_yaml::from_str(&self.read_recipes(recipes).await?)?; + let map_in = serde_yml::from_str(&self.read_map(map).await?)?; + let recipes_in = serde_yml::from_str(&self.read_recipes(recipes).await?)?; let mut gd = Gamedata::build(spec, map_in, recipes_in)?; gd.map = self.maps.clone(); |