tangent128/webmetro
1
0
Fork 0
Code Issues 1 Pull requests Releases Packages Wiki Activity

Add Send bound to WebmetroError::Unknown

Browse source
This commit is contained in:
Tangent 128 2018-04-13 18:53:34 -04:00
parent 2170096a21
commit 8b0467c1d7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/commands/relay.rs
View file

@ -58,9 +58,9 @@ impl RelayServer {
} }
fn post_stream<I: AsRef<[u8]>, S: Stream<Item = I> + 'static>(&self, stream: S) -> BodyStream fn post_stream<I: AsRef<[u8]>, S: Stream<Item = I> + 'static>(&self, stream: S) -> BodyStream
where S::Error: Error { where S::Error: Error + Send {
let source = stream let source = stream
.map_err(|err| WebmetroError::Unknown(err.into())) .map_err(|err| WebmetroError::Unknown(Box::new(err)))
.parse_ebml().chunk_webm(); .parse_ebml().chunk_webm();
let sink = Transmitter::new(self.get_channel()); let sink = Transmitter::new(self.get_channel());

6
src/error.rs
View file

@ -14,7 +14,7 @@ use ebml::EbmlError;
pub enum WebmetroError { pub enum WebmetroError {
EbmlError(EbmlError), EbmlError(EbmlError),
IoError(IoError), IoError(IoError),
Unknown(Box<Error>) Unknown(Box<Error + Send>)
} }
impl Display for WebmetroError { impl Display for WebmetroError {
@ -48,8 +48,8 @@ impl From<IoError> for WebmetroError {
} }
} }
impl From<Box<Error>> for WebmetroError { impl From<Box<Error + Send>> for WebmetroError {
fn from(err: Box<Error>) -> WebmetroError { fn from(err: Box<Error + Send>) -> WebmetroError {
WebmetroError::Unknown(err) WebmetroError::Unknown(err)
} }
} }