From a4322dcdeac296f9820bee0bd98501cfc6ffa20c Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 4 Aug 2023 02:46:35 +0300
Subject: [PATCH] Fix build errors

---
 Cargo.toml          | 6 +-----
 savefile/src/lib.rs | 5 ++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 89d45fa..58f0db1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,8 @@
 [workspace]
-
 members = [
     "savefile",
     "savefile-derive",
     "savefile-test",
     "savefile-min-build",
-    "minitest"
 ]
-
-
-
+resolver = "2"
diff --git a/savefile/src/lib.rs b/savefile/src/lib.rs
index 2142a44..165cea7 100644
--- a/savefile/src/lib.rs
+++ b/savefile/src/lib.rs
@@ -4585,7 +4585,7 @@ impl<const C:usize>  Deserialize for arrayvec::ArrayString<C> {
         deserializer.read_bytes_to_buf(&mut tempbuf[0..l])?;
 
         match std::str::from_utf8(&tempbuf[0..l]) {
-            Ok(s) => Ok(ArrayString::try_from(s)?),
+            Ok(s) => Ok(arrayvec::ArrayString::try_from(s)?),
             Err(_err) => Err(SavefileError::InvalidUtf8 {msg:format!("ArrayString<{}> contained invalid UTF8", C)})
         }
     }
@@ -4641,7 +4641,7 @@ impl<V: Serialize, const C: usize> Serialize for arrayvec::ArrayVec<V,C> {
 
 #[cfg(all(not(feature = "nightly"), feature="arrayvec"))]
 impl<V: Serialize, const C: usize> Serialize for arrayvec::ArrayVec<V,C> {
-    fn serialize(&self, serializer: &mut Serializer) -> Result<(), SavefileError> {
+    fn serialize(&self, serializer: &mut Serializer<impl Write>) -> Result<(), SavefileError> {
         regular_serialize_vec(self, serializer)
     }
 }
@@ -4777,7 +4777,6 @@ use std::path::{PathBuf, Path};
 use std::ptr::NonNull;
 use std::slice;
 use std::sync::Arc;
-use arrayvec::ArrayString;
 
 
 use byteorder::{ReadBytesExt, WriteBytesExt};