berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename `AnyBody::{Message => Stream}`

This commit is contained in:
Rob Ede 2021-11-16 00:33:10 +00:00
parent e8a0e16863
commit c912ec7f81
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-http/CHANGES.md
View File

@ -1,6 +1,10 @@
# Changes # Changes
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
### Changed
* Rename `AnyBody::{Message => Stream}`. [#????]
[#????]: https://github.com/actix/actix-web/pull/????
## 3.0.0-beta.12 - 2021-11-15 ## 3.0.0-beta.12 - 2021-11-15

12
actix-http/src/body/body.rs
View File

@ -27,7 +27,7 @@ pub enum AnyBody {
Bytes(Bytes), Bytes(Bytes),
/// Generic message body. /// Generic message body.
Message(BoxAnyBody), Stream(BoxAnyBody),
} }
impl AnyBody { impl AnyBody {
@ -42,7 +42,7 @@ impl AnyBody {
B: MessageBody + 'static, B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>, B::Error: Into<Box<dyn StdError + 'static>>,
{ {
Self::Message(BoxAnyBody::from_body(body)) Self::Stream(BoxAnyBody::from_body(body))
} }
} }
@ -54,7 +54,7 @@ impl MessageBody for AnyBody {
AnyBody::None => BodySize::None, AnyBody::None => BodySize::None,
AnyBody::Empty => BodySize::Empty, AnyBody::Empty => BodySize::Empty,
AnyBody::Bytes(ref bin) => BodySize::Sized(bin.len() as u64), AnyBody::Bytes(ref bin) => BodySize::Sized(bin.len() as u64),
AnyBody::Message(ref body) => body.size(), AnyBody::Stream(ref body) => body.size(),
} }
} }
@ -74,7 +74,7 @@ impl MessageBody for AnyBody {
} }
} }
AnyBody::Message(body) => body AnyBody::Stream(body) => body
.as_pin_mut() .as_pin_mut()
.poll_next(cx) .poll_next(cx)
.map_err(|err| Error::new_body().with_cause(err)), .map_err(|err| Error::new_body().with_cause(err)),
@ -91,7 +91,7 @@ impl PartialEq for AnyBody {
AnyBody::Bytes(ref b2) => b == b2, AnyBody::Bytes(ref b2) => b == b2,
_ => false, _ => false,
}, },
AnyBody::Message(_) => false, AnyBody::Stream(_) => false,
} }
} }
} }
@ -102,7 +102,7 @@ impl fmt::Debug for AnyBody {
AnyBody::None => write!(f, "AnyBody::None"), AnyBody::None => write!(f, "AnyBody::None"),
AnyBody::Empty => write!(f, "AnyBody::Empty"), AnyBody::Empty => write!(f, "AnyBody::Empty"),
AnyBody::Bytes(ref b) => write!(f, "AnyBody::Bytes({:?})", b), AnyBody::Bytes(ref b) => write!(f, "AnyBody::Bytes({:?})", b),
AnyBody::Message(_) => write!(f, "AnyBody::Message(_)"), AnyBody::Stream(_) => write!(f, "AnyBody::Message(_)"),
} }
} }
} }

2
actix-http/src/encoding/encoder.rs
View File

@ -69,7 +69,7 @@ impl<B: MessageBody> Encoder<B> {
return ResponseBody::Other(Body::Bytes(buf)); return ResponseBody::Other(Body::Bytes(buf));
} }
} }
Body::Message(stream) => EncoderBody::BoxedStream(stream), Body::Stream(stream) => EncoderBody::BoxedStream(stream),
}, },
ResponseBody::Body(stream) => EncoderBody::Stream(stream), ResponseBody::Body(stream) => EncoderBody::Stream(stream),
}; };