Groupsmigration compiles

This commit is contained in:
Sebastian Thiel
2021-04-01 09:58:13 +08:00
parent 3dbb53e924
commit 891f126a56
2 changed files with 15 additions and 3 deletions

View File

@@ -780,11 +780,13 @@ else {
% if simple_media_param:
let request = if protocol == "${simple_media_param.protocol}" {
${READER_SEEK | indent_all_but_first_by(4)}
let mut bytes = Vec::with_capacity(size as usize);
reader.read_to_end(&mut bytes)?;
req_builder.header(CONTENT_TYPE, reader_mime_type.to_string())
.header(CONTENT_LENGTH, size)
.body(&mut reader);
.body(hyper::body::Body::from(bytes))
} else {
req_builder.body(hyper::body::Body::empty())
req_builder.body(hyper::body::Body::from(Vec::new()))
}\
% else:
let request = req_builder

View File

@@ -269,11 +269,15 @@ pub enum Error {
/// Indicates an HTTP repsonse with a non-success status code
Failure(hyper::Response<hyper::body::Body>),
/// An IO error occurred while reading a stream into memory
Io(std::io::Error),
}
impl Display for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Io(ref err) => err.fmt(f),
Error::HttpError(ref err) => err.fmt(f),
Error::UploadSizeLimitExceeded(ref resource_size, ref max_size) => writeln!(
f,
@@ -335,6 +339,12 @@ impl error::Error for Error {
}
}
impl From<std::io::Error> for Error {
fn from(err: std::io::Error) -> Self {
Error::Io(err)
}
}
/// A universal result type used as return for all calls.
pub type Result<T> = std::result::Result<T, Error>;
@@ -593,7 +603,7 @@ impl RangeResponseHeader {
}
}
panic!(format!("Unable to parse Range header {:?}", raw))
panic!("Unable to parse Range header {:?}", raw)
}
}