avl · avl · May 5, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compile_tests/Cargo.lock b/compile_tests/Cargo.lock
diff --git a/savefile-abi/CHANGELOG.md b/savefile-abi/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.2](https://github.com/avl/savefile/compare/savefile-abi-v0.17.1...savefile-abi-v0.17.2) - 2024-05-05
+
+### Other
+- updated the following local packages: savefile, savefile-derive
+
 ## [0.17.1](https://github.com/avl/savefile/compare/savefile-abi-v0.17.0...savefile-abi-v0.17.1) - 2024-05-01
 
 ### Other

diff --git a/savefile-abi/Cargo.toml b/savefile-abi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "savefile-abi"
-version = "0.17.1"
+version = "0.17.2"
 edition = "2021"
 authors = ["Anders Musikka <[email protected]>"]
 documentation = "https://docs.rs/savefile-abi/"
@@ -16,7 +16,7 @@ keywords = ["dylib", "dlopen", "ffi"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-savefile = { path="../savefile", version = "=0.17.1" }
-savefile-derive = { path="../savefile-derive", version = "=0.17.1" }
+savefile = { path="../savefile", version = "=0.17.2" }
+savefile-derive = { path="../savefile-derive", version = "=0.17.2" }
 byteorder = "1.4"
 libloading = "0.8"
diff --git a/savefile-derive/CHANGELOG.md b/savefile-derive/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.2](https://github.com/avl/savefile/compare/savefile-derive-v0.17.1...savefile-derive-v0.17.2) - 2024-05-05
+
+### Other
+- Fix failing test for new rustc
+
 ## [0.17.0-beta.15](https://github.com/avl/savefile/compare/savefile-derive-v0.17.0-beta.14...savefile-derive-v0.17.0-beta.15) - 2024-04-30
 
 ### Fixed

diff --git a/savefile-derive/Cargo.toml b/savefile-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "savefile-derive"
-version = "0.17.1"
+version = "0.17.2"
 authors = ["Anders Musikka <[email protected]>"]
 
 description = "Custom derive macros for savefile crate - simple, convenient, fast, versioned, binary serialization/deserialization library."

diff --git a/savefile-derive/src/lib.rs b/savefile-derive/src/lib.rs
@@ -585,7 +585,7 @@ pub fn savefile_abi_export(item: proc_macro::TokenStream) -> proc_macro::TokenSt
         const _:() = {
             #uses
             #[automatically_derived]
-            unsafe impl AbiExportableImplementation for #implementing_type {
+            unsafe impl AbiExportableImplementation for #implementing_type where #implementing_type: Default + #trait_type {
                 const ABI_ENTRY: unsafe extern "C" fn (AbiProtocol) = #abi_entry;
                 type AbiInterface = dyn #trait_type;
 

diff --git a/savefile-min-build/Cargo.toml b/savefile-min-build/Cargo.toml
@@ -9,4 +9,3 @@ edition = "2021"
 savefile = { path = "../savefile", default-features = false }
 savefile-abi = { path = "../savefile-abi" }
 savefile-derive = {path = "../savefile-derive"}
-alkahest = { version = "0.1", features=["derive"] }
diff --git a/savefile-min-build/src/lib.rs b/savefile-min-build/src/lib.rs
@@ -1,131 +1,14 @@
-/*#![allow(soft_unstable)]
-#![feature(test)]
-extern crate alkahest;
-
-extern crate test;
-
-use std::hint::black_box;
-use test::Bencher;
-
 
 use savefile_derive::Savefile;
-use savefile::Packed;
 
-#[derive(Clone, Copy, Debug, PartialEq,Default)]
-#[derive(alkahest::Schema)]
-#[derive(Savefile)]
-pub struct Vector3 {
-    pub x: f32,
-    pub y: f32,
-    pub z: f32,
-}
 
-impl alkahest::Pack<Vector3> for Vector3 {
-    #[inline]
-    fn pack(self, offset: usize, output: &mut [u8]) -> (alkahest::Packed<Self>, usize) {
-        Vector3Pack {
-            x: self.x,
-            y: self.y,
-            z: self.z,
-        }
-            .pack(offset, output)
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq,Default)]
-#[derive(alkahest::Schema)]
-#[derive(Savefile)]
-pub struct Triangle {
-    pub v0: Vector3,
-    pub v1: Vector3,
-    pub v2: Vector3,
-    pub normal: Vector3,
-}
-impl alkahest::Pack<Triangle> for &'_ Triangle {
-    #[inline]
-    fn pack(self, offset: usize, output: &mut [u8]) -> (alkahest::Packed<Triangle>, usize) {
-        TrianglePack {
-            v0: self.v0,
-            v1: self.v1,
-            v2: self.v2,
-            normal: self.normal,
-        }
-            .pack(offset, output)
-    }
+#[derive(Debug, Savefile, PartialEq)]
+pub enum TestStructEnum {
+    Variant2 { a: u8, b: u8 },
 }
-#[derive(Clone, Debug, PartialEq,Default)]
-#[derive(Savefile)]
-pub struct Mesh {
-    pub triangles: Vec<Triangle>,
-}
-#[derive(alkahest::Schema)]
-pub struct MeshSchema {
-    pub triangles: alkahest::Seq<Triangle>,
-}
-
-impl alkahest::Pack<MeshSchema> for &'_ Mesh {
-    #[inline]
-    fn pack(self, offset: usize, output: &mut [u8]) -> (alkahest::Packed<MeshSchema>, usize) {
-        MeshSchemaPack {
-            triangles: self.triangles.iter(),
-        }
-            .pack(offset, output)
-    }
-}
-
-
-pub fn generate_mesh() -> Mesh {
 
-    let mut mesh = Mesh {
-        triangles: vec![]
-    };
-    const TRIANGLES: usize = 125_000;
-    for _ in 0..TRIANGLES {
-        mesh.triangles.push(Triangle::default())
-    }
-
-    mesh
-}
-#[bench]
-fn bench_alkahest(b: &mut Bencher) {
-    const BUFFER_LEN: usize = 10_000_000;
-    let mesh = generate_mesh();
-    let mut buffer = vec![0; BUFFER_LEN];
-    b.iter(move || {
-        alkahest::write::<MeshSchema, _>(black_box(&mut buffer), black_box(&mesh));
-    });
-}
-
-
-#[bench]
-fn bench_savefile(b: &mut Bencher) {
-    let mesh = generate_mesh();
-    let mut encoded: Vec<u8> = Vec::with_capacity(10_000_000);
-    assert!(unsafe { Triangle::repr_c_optimization_safe(0).is_yes() } );
-    b.iter(move || {
-        /*let l = mesh.triangles.len();
-        let data_ptr = mesh.triangles.as_ptr() as *const u8;
-        let data_len = l * std::mem::size_of::<Triangle>();
-        encoded
-        serializer.write_buf(std::slice::from_raw_parts(
-            self.as_ptr() as *const u8,
-            std::mem::size_of::<T>() * l,
-        ))*/
-        encoded.clear();
+#[test]
+fn test() {
 
-        savefile::save_noschema(black_box(&mut encoded), 0, black_box(&mesh)).unwrap();
-    })
 }
 
-/*
-
-
-
-
-fn stuff<T>() -> T {
-    todo!()
-}
-*/
-#[test]
-fn dummy() {
-}*/
diff --git a/savefile-test/Cargo.toml b/savefile-test/Cargo.toml
@@ -12,7 +12,7 @@ nightly=["savefile/nightly"]
 
 [dependencies]
 savefile = { path = "../savefile", features = ["size_sanity_checks", "encryption", "compression","bit-set","bit-vec","rustc-hash","serde_derive", "quickcheck"]}
-savefile-derive = { path = "../savefile-derive", version = "=0.17.1" }
+savefile-derive = { path = "../savefile-derive", version = "=0.17.2" }
 savefile-abi = { path = "../savefile-abi" }
 bit-vec = "0.6"
 arrayvec="0.7"

diff --git a/savefile-test/src/ext_benchmark.rs b/savefile-test/src/ext_benchmark.rs
@@ -212,6 +212,7 @@ fn bench_ext_triangle(b: &mut Bencher) {
     let mesh = generate_mesh();
     let mut encoded: Vec<u8> = Vec::new();
     b.iter(move || {
+        encoded.clear();
         savefile::save_noschema(black_box(&mut encoded), 0, black_box(&mesh)).unwrap();
     })
 }

diff --git a/savefile/CHANGELOG.md b/savefile/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.2](https://github.com/avl/savefile/compare/savefile-v0.17.1...savefile-v0.17.2) - 2024-05-05
+
+### Fixed
+- Make comment clearer
+
 ## [0.17.1](https://github.com/avl/savefile/compare/savefile-v0.17.0...savefile-v0.17.1) - 2024-05-01
 
 ### Other
@@ -34,4 +39,4 @@ These CHANGELOG-files are experimental.
 ## [0.17.0-beta.12](https://github.com/avl/savefile/compare/savefile-v0.17.0-beta.11...savefile-v0.17.0-beta.12) - 2024-04-27
 
 ### Other
-- Unspecified work
+- Unspecified work
diff --git a/savefile/Cargo.toml b/savefile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "savefile"
-version = "0.17.1"
+version = "0.17.2"
 authors = ["Anders Musikka <[email protected]>"]
 documentation = "https://docs.rs/savefile/"
 homepage = "https://github.com/avl/savefile/"
@@ -54,13 +54,13 @@ bit-set = {version = "0.5", optional = true}
 rustc-hash = {version = "1.1", optional = true}
 memoffset = "0.9"
 byteorder = "1.4"
-savefile-derive = {path="../savefile-derive", version = "=0.17.1", optional = true }
+savefile-derive = {path="../savefile-derive", version = "=0.17.2", optional = true }
 serde_derive = {version= "1.0", optional = true}
 serde = {version= "1.0", optional = true}
 quickcheck = {version= "1.0", optional = true}
 
 [dev-dependencies]
-savefile-derive = { path="../savefile-derive", version = "=0.17.1" }
+savefile-derive = { path="../savefile-derive", version = "=0.17.2" }
 
 [build-dependencies]
 rustc_version="0.2"

diff --git a/savefile/src/lib.rs b/savefile/src/lib.rs
@@ -1240,8 +1240,9 @@ pub trait Packed {
     }
 }
 
-/// This just exists to make sure that no one can implement the ReprC-trait placeholder.
+/// This just exists to make sure that no one can actually implement the ReprC-trait placeholder.
 #[doc(hidden)]
+#[deprecated(since="0.17", note="The 'ReprC' trait has been renamed to 'Packed'.")]
 pub struct DeliberatelyUnimplementable{
     #[allow(dead_code)]
     private: ()
@@ -1253,6 +1254,7 @@ pub trait ReprC {
     #[deprecated(since="0.17", note="The 'ReprC' trait has been renamed to 'Packed'.")]
     #[doc(hidden)]
     #[allow(non_snake_case)]
+    #[allow(deprecated)]
     fn this_is_a_placeholder__if_you_see_this_it_is_likely_that_you_have_code_that_refers_to_ReprC_trait__this_trait_has_been_renamed_to__Packed() -> DeliberatelyUnimplementable;
     unsafe fn repr_c_optimization_safe(_version: u32) -> IsPacked {
         IsPacked::no()