lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Infallible -> NoError"

Browse source 
This reverts commit 9c8f301491.
This commit is contained in:
Llywelwyn 2024-06-15 16:44:13 +01:00
parent 30697a98bb
commit 678636c57d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/saveload_system.rs
View file

@ -9,15 +9,15 @@ use specs::saveload::{
SimpleMarker, SimpleMarker,
SimpleMarkerAllocator, SimpleMarkerAllocator,
}; };
use specs::error::NoError;
use std::fs; use std::fs;
use std::fs::File; use std::fs::File;
use std::path::Path; use std::path::Path;
use std::convert::Infallible;
macro_rules! serialize_individually { macro_rules! serialize_individually {
($ecs:expr, $ser:expr, $data:expr, $($type:ty),*) => { ($ecs:expr, $ser:expr, $data:expr, $($type:ty),*) => {
$( $(
SerializeComponents::<NoError, SimpleMarker<SerializeMe>>::serialize( SerializeComponents::<Infallible, SimpleMarker<SerializeMe>>::serialize(
&( $ecs.read_storage::<$type>(), ), &( $ecs.read_storage::<$type>(), ),
&$data.0, &$data.0,
&$data.1, &$data.1,
@ -157,7 +157,7 @@ pub fn does_save_exist() -> bool {
macro_rules! deserialize_individually { macro_rules! deserialize_individually {
($ecs:expr, $de:expr, $data:expr, $($type:ty),*) => { ($ecs:expr, $de:expr, $data:expr, $($type:ty),*) => {
$( $(
DeserializeComponents::<NoError, _>::deserialize( DeserializeComponents::<Infallible, _>::deserialize(
&mut ( &mut $ecs.write_storage::<$type>(), ), &mut ( &mut $ecs.write_storage::<$type>(), ),
&$data.0, // entities &$data.0, // entities
&mut $data.1, // marker &mut $data.1, // marker