Skip to content

Commit 8ba270b

Browse files
authored
Merge pull request #34 from SandaruKasa/master
Fix build errors
2 parents 57619db + a4322dc commit 8ba270b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
[workspace]
2-
32
members = [
43
"savefile",
54
"savefile-derive",
65
"savefile-test",
76
"savefile-min-build",
8-
"minitest"
97
]
10-
11-
12-
8+
resolver = "2"

savefile/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4585,7 +4585,7 @@ impl<const C:usize> Deserialize for arrayvec::ArrayString<C> {
45854585
deserializer.read_bytes_to_buf(&mut tempbuf[0..l])?;
45864586

45874587
match std::str::from_utf8(&tempbuf[0..l]) {
4588-
Ok(s) => Ok(ArrayString::try_from(s)?),
4588+
Ok(s) => Ok(arrayvec::ArrayString::try_from(s)?),
45894589
Err(_err) => Err(SavefileError::InvalidUtf8 {msg:format!("ArrayString<{}> contained invalid UTF8", C)})
45904590
}
45914591
}
@@ -4641,7 +4641,7 @@ impl<V: Serialize, const C: usize> Serialize for arrayvec::ArrayVec<V,C> {
46414641

46424642
#[cfg(all(not(feature = "nightly"), feature="arrayvec"))]
46434643
impl<V: Serialize, const C: usize> Serialize for arrayvec::ArrayVec<V,C> {
4644-
fn serialize(&self, serializer: &mut Serializer) -> Result<(), SavefileError> {
4644+
fn serialize(&self, serializer: &mut Serializer<impl Write>) -> Result<(), SavefileError> {
46454645
regular_serialize_vec(self, serializer)
46464646
}
46474647
}
@@ -4777,7 +4777,6 @@ use std::path::{PathBuf, Path};
47774777
use std::ptr::NonNull;
47784778
use std::slice;
47794779
use std::sync::Arc;
4780-
use arrayvec::ArrayString;
47814780

47824781

47834782
use byteorder::{ReadBytesExt, WriteBytesExt};

0 commit comments

Comments
 (0)