Skip to content

Commit f1c6cad

Browse files
committed
Use question_mark feature in linkchecker.
1 parent 4812cf3 commit f1c6cad

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/tools/linkchecker/main.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
//! A few whitelisted exceptions are allowed as there's known bugs in rustdoc,
2525
//! but this should catch the majority of "broken link" cases.
2626
27+
#![feature(question_mark)]
28+
2729
extern crate url;
2830

2931
use std::env;
@@ -243,15 +245,14 @@ fn load_file(cache: &mut Cache,
243245
None
244246
}
245247
Entry::Vacant(entry) => {
246-
let mut fp = try!(File::open(file.clone()).map_err(|err| {
248+
let mut fp = File::open(file.clone()).map_err(|err| {
247249
if let FromRedirect(true) = redirect {
248250
LoadError::BrokenRedirect(file.clone(), err)
249251
} else {
250252
LoadError::IOError(err)
251253
}
252-
}));
253-
try!(fp.read_to_string(&mut contents)
254-
.map_err(|err| LoadError::IOError(err)));
254+
})?;
255+
fp.read_to_string(&mut contents).map_err(|err| LoadError::IOError(err))?;
255256

256257
let maybe = maybe_redirect(&contents);
257258
if maybe.is_some() {

0 commit comments

Comments
 (0)