-
-
Notifications
You must be signed in to change notification settings - Fork 69
feat(util): introduce ErrorBody<D, E>
#179
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cratelyn
wants to merge
2
commits into
master
Choose a base branch
from
error-body
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+122
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| use bytes::Buf; | ||
| use http_body::{Body, Frame, SizeHint}; | ||
| use std::{ | ||
| marker::PhantomData, | ||
| pin::Pin, | ||
| task::{Context, Poll}, | ||
| }; | ||
|
|
||
| /// A [`Body`] that returns an error when polled. | ||
| /// | ||
| /// An [`ErrorBody<D, E>`] is a body that will yield an `E`-typed error when [`Body::poll_frame()`] | ||
| /// is called. The `D` generic allows this body to be treated as a body that would yield a | ||
| /// particular [`Body::Data`] were it not to fail. | ||
| /// | ||
| /// This is most often useful for situations like exercising error-handling logic in tests. | ||
| #[derive(Debug)] | ||
| pub struct ErrorBody<D, E> { | ||
| error: Option<E>, | ||
| data: PhantomData<D>, | ||
| } | ||
|
|
||
| // === impl ErrorBody === | ||
|
|
||
| impl<D, E> ErrorBody<D, E> { | ||
| /// Returns a new [`ErrorBody`] that will yield the provided error. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use bytes::Bytes; | ||
| /// use http_body_util::{BodyExt, ErrorBody}; | ||
| /// | ||
| /// #[tokio::main] | ||
| /// async fn main() { | ||
| /// let mut body = ErrorBody::<Bytes, &str>::new("problem"); | ||
| /// let frame = body.frame().await; | ||
| /// assert_eq!( | ||
| /// frame.unwrap().unwrap_err(), | ||
| /// "problem", | ||
| /// ); | ||
| /// } | ||
| /// ``` | ||
| pub fn new(error: E) -> Self { | ||
| Self { | ||
| error: Some(error), | ||
| data: PhantomData, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<D, E> Body for ErrorBody<D, E> | ||
| where | ||
| E: Unpin, | ||
| D: Buf + Unpin, | ||
| { | ||
| type Data = D; | ||
| type Error = E; | ||
|
|
||
| fn poll_frame( | ||
| self: Pin<&mut Self>, | ||
| _: &mut Context<'_>, | ||
| ) -> Poll<Option<Result<Frame<Self::Data>, Self::Error>>> { | ||
| let Self { error, .. } = self.get_mut(); | ||
|
|
||
| if let Some(error) = error.take() { | ||
| return Poll::Ready(Some(Err(error))); | ||
| } | ||
|
|
||
| Poll::Ready(None) | ||
| } | ||
|
|
||
| fn is_end_stream(&self) -> bool { | ||
| self.error.is_none() | ||
| } | ||
|
|
||
| fn size_hint(&self) -> SizeHint { | ||
| SizeHint::default() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod error_body_tests { | ||
| use super::ErrorBody; | ||
| use bytes::Bytes; | ||
| use http_body::Body; | ||
| use std::{ | ||
| ops::Not, | ||
| pin::Pin, | ||
| task::{Context, Poll}, | ||
| }; | ||
|
|
||
| #[test] | ||
| fn returns_error() { | ||
| type Error = &'static str; | ||
|
|
||
| let mut body = ErrorBody::<Bytes, Error>::new("problem"); | ||
|
|
||
| assert!( | ||
| body.is_end_stream().not(), | ||
| "body is not finished until polled" | ||
| ); | ||
| assert_eq!(body.size_hint().lower(), 0); | ||
| assert_eq!(body.size_hint().upper(), None); | ||
|
|
||
| let waker = futures_util::task::noop_waker(); | ||
| let mut cx = Context::from_waker(&waker); | ||
|
|
||
| match Pin::new(&mut body).poll_frame(&mut cx) { | ||
| Poll::Ready(Some(Err("problem"))) => {} | ||
| other => panic!("unexpected poll outcome: {:?}", other), | ||
| } | ||
|
|
||
| assert!(body.is_end_stream(), "body is finished after being polled"); | ||
|
|
||
| match Pin::new(&mut body).poll_frame(&mut cx) { | ||
| Poll::Ready(None) => {} | ||
| other => panic!("unexpected poll outcome: {:?}", other), | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚴 bikeshed: i could see this being called
Error, rather thanErrorBody. becausestd::error::Erroris such a foundational type though, and other common types likeanyhow::Errorandthiserror::Errorwould also conflict with that, i opted to include theBodysuffix.