Skip to content

Commit 625a4d3

Browse files
pietroalbinijplatte
authored andcommitted
link: use ? instead of try!
1 parent 5329b84 commit 625a4d3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/common/link.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -427,33 +427,33 @@ impl fmt::Display for Link {
427427

428428
impl fmt::Display for LinkValue {
429429
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
430-
try!(write!(f, "<{}>", self.link));
430+
write!(f, "<{}>", self.link)?;
431431

432432
if let Some(ref rel) = self.rel {
433-
try!(fmt_delimited(f, rel.as_slice(), " ", ("; rel=\"", "\"")));
433+
fmt_delimited(f, rel.as_slice(), " ", ("; rel=\"", "\""))?;
434434
}
435435
if let Some(ref anchor) = self.anchor {
436-
try!(write!(f, "; anchor=\"{}\"", anchor));
436+
write!(f, "; anchor=\"{}\"", anchor)?;
437437
}
438438
if let Some(ref rev) = self.rev {
439-
try!(fmt_delimited(f, rev.as_slice(), " ", ("; rev=\"", "\"")));
439+
fmt_delimited(f, rev.as_slice(), " ", ("; rev=\"", "\""))?;
440440
}
441441
if let Some(ref href_lang) = self.href_lang {
442442
for tag in href_lang {
443-
try!(write!(f, "; hreflang={}", tag));
443+
write!(f, "; hreflang={}", tag)?;
444444
}
445445
}
446446
if let Some(ref media_desc) = self.media_desc {
447-
try!(fmt_delimited(f, media_desc.as_slice(), ", ", ("; media=\"", "\"")));
447+
fmt_delimited(f, media_desc.as_slice(), ", ", ("; media=\"", "\""))?;
448448
}
449449
if let Some(ref title) = self.title {
450-
try!(write!(f, "; title=\"{}\"", title));
450+
write!(f, "; title=\"{}\"", title)?;
451451
}
452452
if let Some(ref title_star) = self.title_star {
453-
try!(write!(f, "; title*={}", title_star));
453+
write!(f, "; title*={}", title_star)?;
454454
}
455455
if let Some(ref media_type) = self.media_type {
456-
try!(write!(f, "; type=\"{}\"", media_type));
456+
write!(f, "; type=\"{}\"", media_type)?;
457457
}
458458

459459
Ok(())
@@ -858,15 +858,15 @@ impl<'a> Iterator for SplitAsciiUnquoted<'a> {
858858
fn fmt_delimited<T: fmt::Display>(f: &mut fmt::Formatter, p: &[T], d: &str, b: (&str, &str)) -> fmt::Result {
859859
if p.len() != 0 {
860860
// Write a starting string `b.0` before the first element
861-
try!(write!(f, "{}{}", b.0, p[0]));
861+
write!(f, "{}{}", b.0, p[0])?;
862862

863863
for i in &p[1..] {
864864
// Write the next element preceded by the delimiter `d`
865-
try!(write!(f, "{}{}", d, i));
865+
write!(f, "{}{}", d, i)?;
866866
}
867867

868868
// Write a ending string `b.1` before the first element
869-
try!(write!(f, "{}", b.1));
869+
write!(f, "{}", b.1)?;
870870
}
871871

872872
Ok(())

0 commit comments

Comments
 (0)