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 Deserialize for arrayvec::ArrayString { 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 Serialize for arrayvec::ArrayVec { #[cfg(all(not(feature = "nightly"), feature="arrayvec"))] impl Serialize for arrayvec::ArrayVec { - fn serialize(&self, serializer: &mut Serializer) -> Result<(), SavefileError> { + fn serialize(&self, serializer: &mut Serializer) -> 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};