support for std::range

savefile-test/build.rs

@@ -1,6 +1,13 @@
 extern crate rustc_version;
-use rustc_version::{version_meta, Channel};
+use rustc_version::{version, version_meta, Channel, Version};
 fn main() {
+    println!("cargo:rustc-check-cfg=cfg(has_new_range)");
+    // std::range::Range was stabilized in rust 1.96
+    if let Ok(version) = version() {
+        if version >= Version::new(1, 96, 0) {
+            println!("cargo:rustc-cfg=has_new_range");
+        }
+    }
     if version_meta().unwrap().channel == Channel::Nightly {
         println!("cargo:rustc-cfg=feature=\"nightly\"");
     }

savefile-test/src/lib.rs

@@ -134,6 +134,19 @@ pub fn roundtrip_version<E: Serialize + Deserialize>(sample: E, version: u32) ->
     assert_eq!(f.position() as usize, f_internal_size);
     roundtrip_result
 }
+#[cfg(has_new_range)]
+#[test]
+pub fn test_new_range() {
+    assert_roundtrip(std::range::Range { start: 3u32, end: 7u32 });
+
+    // std::ops::Range and std::range::Range must be wire-compatible
+    let mut f = Cursor::new(Vec::new());
+    Serializer::save(&mut f, 0, &(3u32..7u32), false).unwrap();
+    f.set_position(0);
+    let new_range = Deserializer::load::<std::range::Range<u32>>(&mut f, 0).unwrap();
+    assert_eq!(new_range, std::range::Range { start: 3, end: 7 });
+}
+
 #[derive(Debug, Savefile, PartialEq)]
 pub enum TestStructEnum {
     Variant1 { a: u8, b: u8 },

savefile/build.rs

@@ -1,6 +1,15 @@
 extern crate rustc_version;
-use rustc_version::{version_meta, Channel};
+use rustc_version::{version, version_meta, Channel, Version};
 fn main() {
+    println!("cargo:rustc-check-cfg=cfg(has_new_range)");
+
+    // std::range::Range was stabilized in rust 1.96
+    if let Ok(version) = version() {
+        if version >= Version::new(1, 96, 0) {
+            println!("cargo:rustc-cfg=has_new_range");
+        }
+    }
+
     let version = version_meta().unwrap();
     if version.channel == Channel::Nightly {
         println!("cargo:rustc-cfg=feature=\"nightly\"");

savefile/src/lib.rs

@@ -7274,6 +7274,49 @@ impl<T1: Introspect> Introspect for Range<T1> {
     }
 }
 
+
+// std::range::Range requires rust 1.96 or later. Serialized format is
+// identical to that of std::ops::Range, so the two are wire-compatible.
+#[cfg(has_new_range)]
+impl<T1> Packed for std::range::Range<T1> {}
+#[cfg(has_new_range)]
+impl<T1: WithSchema> WithSchema for std::range::Range<T1> {
+    fn schema(version: u32, context: &mut WithSchemaContext) -> Schema {
+        Schema::new_tuple2::<T1, T1>(version, context)
+    }
+}
+#[cfg(has_new_range)]
+impl<T1: Serialize> Serialize for std::range::Range<T1> {
+    fn serialize(&self, serializer: &mut Serializer<impl Write>) -> Result<(), SavefileError> {
+        self.start.serialize(serializer)?;
+        self.end.serialize(serializer)?;
+        Ok(())
+    }
+}
+#[cfg(has_new_range)]
+impl<T1: Deserialize> Deserialize for std::range::Range<T1> {
+    fn deserialize(deserializer: &mut Deserializer<impl Read>) -> Result<Self, SavefileError> {
+        Ok((T1::deserialize(deserializer)?..T1::deserialize(deserializer)?).into())
+    }
+}
+#[cfg(has_new_range)]
+impl<T1: Introspect> Introspect for std::range::Range<T1> {
+    fn introspect_value(&self) -> String {
+        return "Range".to_string();
+    }
+
+    fn introspect_child(&self, index: usize) -> Option<Box<dyn IntrospectItem<'_> + '_>> {
+        if index == 0 {
+            return Some(introspect_item("start".to_string(), &self.start));
+        }
+        if index == 1 {
+            return Some(introspect_item("end".to_string(), &self.end));
+        }
+        return None;
+    }
+}
+
+
 impl<T1: Packed> Packed for (T1,) {
     unsafe fn repr_c_optimization_safe(version: u32) -> IsPacked {
         if offset_of_tuple!((T1,), 0) == 0 && std::mem::size_of::<T1>() == std::mem::size_of::<(T1,)>() {