merge

Author: avl

.github/workflows/rust.yml

@@ -0,0 +1,32 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install nightly
+      run: rustup toolchain install nightly
+    - name: Build (nightly)
+      run: cargo +nightly build --workspace 
+    - name: Run tests (nightly)
+      run: cargo +nightly test --workspace 
+    - name: Build min-deps (nightly)
+      run: cargo +nightly build -p savefile-min-build 
+    - name: Build (stable)
+      run: cargo +stable build --workspace 
+    - name: Run tests (stable)
+      run: cargo +stable test --workspace 
+    - name: Build min-deps (stable)
+      run: cargo +stable build -p savefile-min-build 

README.md

@@ -1,3 +1,5 @@
+![build](https://github.com/avl/savefile/actions/workflows/rust.yml/badge.svg)
+
 # Introduction to Savefile 
 
 Savefile is a library to effortlessly serialize rust structs and enums. It uses
@@ -63,6 +65,10 @@ fn main() {
 
 # Changelog
 
+## 0.16.3
+
+Just some fixes to the test suite, needed to make github actions CI work. 
+
 ## 0.16.2
 
 Fixes multiple problems. The most impactful being that 0.16.1 could only be built

savefile-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "savefile-derive"
-version = "0.16.2"
+version = "0.16.3"
 authors = ["Anders Musikka <[email protected]>"]
 
 description = "Custom derive macros for savefile crate - simple, convenient, fast, versioned, binary serialization/deserialization library."

savefile-test/Cargo.toml

@@ -2,7 +2,7 @@
 name = "savefile-test"
 version = "0.0.1"
 authors = ["Anders Musikka <[email protected]>"]
-
+resolver = "2"
 [features]
 default = ["external_benchmarks"]
 # Enable this to reduce risk of crashing on corrupt input. Provides sanity checks for sizes of objects.
@@ -12,11 +12,11 @@ nightly=["savefile/nightly"]
 
 [dependencies]
 savefile = { path = "../savefile", features = ["size_sanity_checks", "encryption", "compression","bit-set","bit-vec","rustc-hash"]}
-savefile-derive = { path = "../savefile-derive" }
+savefile-derive = { path = "../savefile-derive", version = "=0.16.3" }
 bit-vec = "0.6"
 arrayvec="0.7"
 smallvec="*"
-indexmap="*"
+indexmap = { version = "1.9"}
 byteorder="*"
 rand="0.8"
 parking_lot="0.12"

savefile-test/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(feature="nightly", feature(integer_atomics))]
 #![allow(unused_imports)]
 #![cfg_attr(feature="nightly", feature(test))]
 #![deny(warnings)]
@@ -1413,7 +1412,7 @@ pub fn test_struct_with_ignored_member() {
 pub fn test_indexmap() {
     let mut imap = IndexMap::new();
     assert_roundtrip(imap.clone());
-    imap.insert(43,"hej".to_string());
+    imap.insert(43u32,"hej".to_string());
     assert_roundtrip(imap.clone());
 
     imap.insert(44,"hej".to_string());
@@ -1426,7 +1425,7 @@ pub fn test_indexmap() {
 pub fn test_indexset() {
     let mut iset = IndexSet::new();
     assert_roundtrip(iset.clone());
-    iset.insert((43,44));
+    iset.insert((43u32,44u32));
     assert_roundtrip(iset.clone());
 
     iset.insert((43,43));

savefile/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "savefile"
-version = "0.16.2"
+version = "0.16.3"
 authors = ["Anders Musikka <[email protected]>"]
 documentation = "https://docs.rs/savefile/"
 homepage = "https://github.com/avl/savefile/"
@@ -52,10 +52,10 @@ 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.16.2", optional = true }
+savefile-derive = {path="../savefile-derive", version = "=0.16.3", optional = true }
 
 [dev-dependencies]
-savefile-derive = { path="../savefile-derive" }
+savefile-derive = { path="../savefile-derive", version = "=0.16.3" }
 
 [build-dependencies]
 rustc_version="0.2"

savefile/src/lib.rs

@@ -99,7 +99,7 @@ Mark the struct like so:
 ```
 extern crate savefile;
 use savefile::prelude::*;
-
+use std::path::Path;
 #[macro_use]
 extern crate savefile_derive;
 
@@ -126,6 +126,8 @@ fn load_player(file:&'static str) -> Player {
 }
 
 fn main() {
+    if Path::new("save.bin").exists() == false { /* error handling */ return;}
+
     let mut player = load_player("save.bin"); //Load from previous save
     assert_eq!("Steve",&player.name); //The name from the previous version saved will remain
     assert_eq!(0,player.skills.len()); //Skills didn't exist when this was saved
@@ -470,6 +472,7 @@ Rules for using the #\[savefile_versions] attribute:
  ```
  extern crate savefile;
  use savefile::prelude::*;
+ use std::path::Path;
 
  #[macro_use]
  extern crate savefile_derive;
@@ -503,6 +506,9 @@ Rules for using the #\[savefile_versions] attribute:
  }
 
  fn main() {
+
+     if Path::new("newsave.bin").exists() == false { /* error handling */ return;}
+
      let mut player = load_player("newsave.bin"); //Load from previous save
      player.history.push(Position{x:1,y:1});
      player.history.push(Position{x:2,y:1});