Replace forgiving-semver with semver

forgiving-semver is incompatible with Rust ≥1.86—

    error[E0658]: custom inner attributes are unstable
     --> /build/little-a-map-0.13.5-vendor/forgiving-semver-parser-0.10.1/src/generated.rs:4:4
      |
    4 | #![rustfmt::skip]
      |    ^^^^^^^^^^^^^
      |
      = note: see issue #54726 <rust-lang/rust#54726> for more information

—and unmaintained (porkbrain/forgiving-semver#1).

Author: AndrewKvalheim

Cargo.lock

@@ -33,14 +33,14 @@ env_logger = "0.11.3"
 fastanvil = "0.31.0"
 fastnbt = "2.5.0"
 flate2 = { version = "1.0", features = ["zlib-ng"], default-features = false }
-forgiving-semver = { version = "0.11.0", features = ["serde"] }
 glob = "0.3"
 indicatif = { version = "0.17", features = ["rayon"] }
 itertools = "0.13"
 log = "0.4"
 once_cell = "1.4"
 paw = "1.0"
 rayon = "1.10"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_with = { version = "3.0", features = ["json"] }

Cargo.toml

@@ -88,12 +88,12 @@ fn validate_version<'de, D: Deserializer<'de>>(deserializer: D) -> Result<String
 #[cfg(test)]
 mod test {
     use super::*;
-    use forgiving_semver::Version;
+    use semver::Version;
     use serde_json::json;
 
     fn next_version(text: impl AsRef<str>) -> String {
         let mut version = Version::parse(text.as_ref()).unwrap();
-        version.increment_patch();
+        version.patch += 1;
         version.to_string()
     }
 

src/cache.rs

@@ -2,19 +2,50 @@ use super::COMPATIBLE_VERSIONS;
 use crate::utilities::read_gz;
 use anyhow::{Context, Result};
 use fastnbt::from_bytes;
-use forgiving_semver::{Version, VersionReq};
+use semver::{Version, VersionReq};
+use serde::{de, Deserialize, Deserializer};
 use std::path::Path;
 
-#[derive(serde_query::Deserialize)]
 pub struct Level {
-    #[query(".Data.SpawnX")]
     pub spawn_x: i32,
-    #[query(".Data.SpawnZ")]
     pub spawn_z: i32,
-    #[query(".Data.Version.Name")]
     pub version: Version,
 }
 
+impl<'de> Deserialize<'de> for Level {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[derive(serde_query::Deserialize)]
+        struct Internal {
+            #[query(".Data.SpawnX")]
+            spawn_x: i32,
+            #[query(".Data.SpawnZ")]
+            spawn_z: i32,
+            #[query(".Data.Version.Name")]
+            version: String,
+        }
+
+        let mut internal = Internal::deserialize(deserializer)?;
+
+        // Workaround for dtolnay/semver#219
+        internal.version.push_str(
+            &".0".repeat(
+                2 - internal
+                    .version
+                    .chars()
+                    .filter(|&c| c == '.')
+                    .take(2)
+                    .count(),
+            ),
+        );
+
+        Ok(Self {
+            spawn_x: internal.spawn_x,
+            spawn_z: internal.spawn_z,
+            version: Version::parse(&internal.version).map_err(de::Error::custom)?,
+        })
+    }
+}
+
 impl Level {
     pub fn from_world_path(world_path: &Path) -> Result<Self> {
         let path = world_path.join("level.dat");

src/level.rs

@@ -1,4 +1,4 @@
-use forgiving_semver::VersionReq;
+use semver::VersionReq;
 use glob::glob;
 use image::{GenericImageView, Pixel};
 use itertools::{assert_equal, Itertools};