From 678636c57dc56960ea3e9fd95cd1020e7d134157 Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Sat, 15 Jun 2024 16:44:13 +0100 Subject: [PATCH] Revert "Infallible -> NoError" This reverts commit 9c8f3014911730cd402ae2842fbbb4b7a32cb724. --- src/saveload_system.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/saveload_system.rs b/src/saveload_system.rs index ccdc1ee..3e3debe 100644 --- a/src/saveload_system.rs +++ b/src/saveload_system.rs @@ -9,15 +9,15 @@ use specs::saveload::{ SimpleMarker, SimpleMarkerAllocator, }; -use specs::error::NoError; use std::fs; use std::fs::File; use std::path::Path; +use std::convert::Infallible; macro_rules! serialize_individually { ($ecs:expr, $ser:expr, $data:expr, $($type:ty),*) => { $( - SerializeComponents::>::serialize( + SerializeComponents::>::serialize( &( $ecs.read_storage::<$type>(), ), &$data.0, &$data.1, @@ -157,7 +157,7 @@ pub fn does_save_exist() -> bool { macro_rules! deserialize_individually { ($ecs:expr, $de:expr, $data:expr, $($type:ty),*) => { $( - DeserializeComponents::::deserialize( + DeserializeComponents::::deserialize( &mut ( &mut $ecs.write_storage::<$type>(), ), &$data.0, // entities &mut $data.1, // marker