Skip to content

Commit cef0e15

Browse files
Fixed CI issues
1 parent bc344d2 commit cef0e15

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/error.rs

+2
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,14 @@ pub enum OutOfMemory {
197197
Alloc(AllocError),
198198
}
199199

200+
#[cfg(feature = "alloc")]
200201
impl From<TryReserveError> for DecodeError {
201202
fn from(e: TryReserveError) -> Self {
202203
Self::OutOfMemory(OutOfMemory::TryReserve(e))
203204
}
204205
}
205206

207+
#[cfg(feature = "alloc")]
206208
impl From<TryReserveError> for EncodeError {
207209
fn from(e: TryReserveError) -> Self {
208210
Self::OutOfMemory(OutOfMemory::TryReserve(e))

src/features/serde/de_borrowed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ impl<'de, 'a, DE: BorrowDecoder<'de>> EnumAccess<'de> for SerdeDecoder<'a, 'de,
403403
V: DeserializeSeed<'de>,
404404
{
405405
let idx = u32::decode(&mut self.de)?;
406-
let val = seed.deserialize(idx.into_deserializer())?;
406+
let val = seed.deserialize(serde::de::value::U32Deserializer::<Self::Error>::new(idx))?;
407407
Ok((val, self))
408408
}
409409
}

src/features/serde/de_owned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ impl<'de, 'a, DE: Decoder> EnumAccess<'de> for SerdeDecoder<'a, DE> {
449449
V: DeserializeSeed<'de>,
450450
{
451451
let idx = u32::decode(&mut self.de)?;
452-
let val = seed.deserialize(idx.into_deserializer())?;
452+
let val = seed.deserialize(serde::de::value::U32Deserializer::<Self::Error>::new(idx))?;
453453
Ok((val, self))
454454
}
455455
}

src/features/serde/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,9 @@ pub enum EncodeError {
142142
CustomError,
143143
}
144144

145-
#[allow(clippy::from_over_into)]
146-
impl Into<crate::error::EncodeError> for EncodeError {
147-
fn into(self) -> crate::error::EncodeError {
148-
crate::error::EncodeError::Serde(self)
145+
impl From<EncodeError> for crate::error::EncodeError {
146+
fn from(val: EncodeError) -> Self {
147+
crate::error::EncodeError::Serde(val)
149148
}
150149
}
151150

src/features/serde/ser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ where
224224
}
225225

226226
fn serialize_seq(mut self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
227-
let len = len.ok_or_else(|| SerdeEncodeError::SequenceMustHaveLength.into())?;
227+
let len = len.ok_or(EncodeError::Serde(SerdeEncodeError::SequenceMustHaveLength))?;
228228
len.encode(&mut self.enc)?;
229229
Ok(Compound { enc: self.enc })
230230
}
@@ -253,7 +253,7 @@ where
253253
}
254254

255255
fn serialize_map(mut self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
256-
let len = len.ok_or_else(|| SerdeEncodeError::SequenceMustHaveLength.into())?;
256+
let len = len.ok_or(EncodeError::Serde(SerdeEncodeError::SequenceMustHaveLength))?;
257257
len.encode(&mut self.enc)?;
258258
Ok(Compound { enc: self.enc })
259259
}

0 commit comments

Comments
 (0)