feat: fix merge conflicts

src/array_string.rs

@@ -638,22 +638,22 @@ impl<'de, const CAP: usize, LenType: LenUint> Deserialize<'de> for ArrayString<C
 
 #[cfg(feature = "borsh")]
 /// Requires crate feature `"borsh"`
-impl<const CAP: usize> borsh::BorshSerialize for ArrayString<CAP> {
+impl<const CAP: usize, LenType: LenUint> borsh::BorshSerialize for ArrayString<CAP, LenType> {
     fn serialize<W: borsh::io::Write>(&self, writer: &mut W) -> borsh::io::Result<()> {
         <str as borsh::BorshSerialize>::serialize(&*self, writer)
     }
 }
 
 #[cfg(feature = "borsh")]
 /// Requires crate feature `"borsh"`
-impl<const CAP: usize> borsh::BorshDeserialize for ArrayString<CAP> {
+impl<const CAP: usize, LenType: LenUint> borsh::BorshDeserialize for ArrayString<CAP, LenType> {
     fn deserialize_reader<R: borsh::io::Read>(reader: &mut R) -> borsh::io::Result<Self> {
         let len = <u32 as borsh::BorshDeserialize>::deserialize_reader(reader)? as usize;
         if len > CAP {
             return Err(borsh::io::Error::new(
                 borsh::io::ErrorKind::InvalidData,
                 format!("Expected a string no more than {} bytes long", CAP),
-            ))
+            ));
         }
 
         let mut buf = [0u8; CAP];

src/arrayvec.rs

@@ -1317,7 +1317,7 @@ impl<'de, T: Deserialize<'de>, const CAP: usize, LenType: LenUint> Deserialize<'
 
 #[cfg(feature = "borsh")]
 /// Requires crate feature `"borsh"`
-impl<T, const CAP: usize> borsh::BorshSerialize for ArrayVec<T, CAP>
+impl<T, const CAP: usize, LenType: LenUint> borsh::BorshSerialize for ArrayVec<T, CAP, LenType>
     where
         T: borsh::BorshSerialize,
 {
@@ -1328,7 +1328,7 @@ impl<T, const CAP: usize> borsh::BorshSerialize for ArrayVec<T, CAP>
 
 #[cfg(feature = "borsh")]
 /// Requires crate feature `"borsh"`
-impl<T, const CAP: usize> borsh::BorshDeserialize for ArrayVec<T, CAP>
+impl<T, const CAP: usize, LenType: LenUint> borsh::BorshDeserialize for ArrayVec<T, CAP, LenType>
     where
         T: borsh::BorshDeserialize,
 {

tests/borsh.rs

@@ -59,7 +59,7 @@ mod array_string {
 
     #[test]
     fn test_full() {
-        let string = ArrayString::from_byte_string(b"hello world").unwrap();
+        let string = ArrayString::<11>::from_byte_string(b"hello world").unwrap();
         assert_ser(&string, b"\x0b\0\0\0hello world");
         assert_roundtrip(&string);
     }