mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-05 22:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove From<io::Error> constraint for Sink impl

Browse source
This commit is contained in:
Nikolay Kim 2020-08-10 17:27:52 +06:00
parent 8a6c476d02
commit c3ca68dfbd
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ntex-codec/src/framed.rs
View file

@ -457,9 +457,8 @@ impl<T, U> Sink<U::Item> for Framed<T, U>
where where
T: AsyncRead + AsyncWrite + Unpin, T: AsyncRead + AsyncWrite + Unpin,
U: Encoder + Unpin, U: Encoder + Unpin,
U::Error: From<io::Error>,
{ {
type Error = U::Error; type Error = Either<U::Error, io::Error>;
#[inline] #[inline]
fn poll_ready( fn poll_ready(
@ -478,7 +477,7 @@ where
mut self: Pin<&mut Self>, mut self: Pin<&mut Self>,
item: <U as Encoder>::Item, item: <U as Encoder>::Item,
) -> Result<(), Self::Error> { ) -> Result<(), Self::Error> {
self.write(item) self.write(item).map_err(Either::Left)
} }
#[inline] #[inline]
@ -486,7 +485,7 @@ where
mut self: Pin<&mut Self>, mut self: Pin<&mut Self>,
cx: &mut Context<'_>, cx: &mut Context<'_>,
) -> Poll<Result<(), Self::Error>> { ) -> Poll<Result<(), Self::Error>> {
self.flush(cx).map_err(From::from) self.flush(cx).map_err(Either::Right)
} }
#[inline] #[inline]
@ -494,7 +493,7 @@ where
mut self: Pin<&mut Self>, mut self: Pin<&mut Self>,
cx: &mut Context<'_>, cx: &mut Context<'_>,
) -> Poll<Result<(), Self::Error>> { ) -> Poll<Result<(), Self::Error>> {
self.close(cx).map_err(|e| e.into()) self.close(cx).map_err(Either::Right)
} }
} }