1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-30 12:00:38 +00:00

Merge branch 'master' of github.com:actix/actix-web

This commit is contained in:
Nikolay Kim 2018-04-17 16:24:02 -07:00
commit 50b9fee3a7
2 changed files with 7 additions and 7 deletions

View file

@ -171,16 +171,16 @@ impl Display for ContentRangeSpec {
range,
instance_length,
} => {
try!(f.write_str("bytes "));
f.write_str("bytes ")?;
match range {
Some((first_byte, last_byte)) => {
try!(write!(f, "{}-{}", first_byte, last_byte));
write!(f, "{}-{}", first_byte, last_byte)?;
}
None => {
try!(f.write_str("*"));
f.write_str("*")?;
}
};
try!(f.write_str("/"));
f.write_str("/")?;
if let Some(v) = instance_length {
write!(f, "{}", v)
} else {
@ -191,8 +191,8 @@ impl Display for ContentRangeSpec {
ref unit,
ref resp,
} => {
try!(f.write_str(unit));
try!(f.write_str(" "));
f.write_str(unit)?;
f.write_str(" ")?;
f.write_str(resp)
}
}

View file

@ -59,7 +59,7 @@ impl<T: PartialEq> cmp::PartialOrd for QualityItem<T> {
impl<T: fmt::Display> fmt::Display for QualityItem<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(fmt::Display::fmt(&self.item, f));
fmt::Display::fmt(&self.item, f)?;
match self.quality.0 {
1000 => Ok(()),
0 => f.write_str("; q=0"),