From 87dbe32644a66dc4be2c3cf82d47d62f2907405f Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Sat, 27 May 2023 22:21:09 +0200 Subject: Don't use associated_type_bounds feature --- src/lib.rs | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ef72615..d433655 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,4 @@ #![feature(array_try_from_fn)] -#![feature(associated_type_bounds)] #![feature(iterator_try_collect)] pub use flate2; @@ -179,29 +178,22 @@ impl MtLen for usize { } } -trait MtCfgLen: - Sized - + MtSerialize - + MtDeserialize - + TryFrom> - + TryInto> -{ -} +trait MtCfgLen: Sized + MtSerialize + MtDeserialize + TryFrom + TryInto {} -impl MtCfg for T { +impl MtCfg for T +where + SerializeError: From<>::Error>, + DeserializeError: From<>::Error>, +{ type Len = usize; type Inner = DefCfg; fn write_len(len: usize, writer: &mut impl Write) -> Result<(), SerializeError> { - Self::try_from(len) - .map_err(Into::into)? - .mt_serialize::(writer) + Self::try_from(len)?.mt_serialize::(writer) } fn read_len(reader: &mut impl Read) -> Result { - Self::mt_deserialize::(reader)? - .try_into() - .map_err(Into::into) + Ok(Self::mt_deserialize::(reader)?.try_into()?) } } -- cgit v1.2.3