about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorAhmed Charles <acharles@outlook.com>2016-08-27 01:42:56 -0700
committerAhmed Charles <acharles@outlook.com>2016-09-11 16:00:50 -0700
commitf1c6cad96398d558e6ecca9cc144a1b96da9e4c5 (patch)
treebd3dfea97e6afed2c5de75fd9ac7d48d54b45673 /src/tools
parent4812cf392f1fa2258033356dd872fbee58a5406e (diff)
downloadrust-f1c6cad96398d558e6ecca9cc144a1b96da9e4c5.tar.gz
rust-f1c6cad96398d558e6ecca9cc144a1b96da9e4c5.zip
Use question_mark feature in linkchecker.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/linkchecker/main.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index 27adabbc72e..3e2bc9032a1 100644
--- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs
@@ -24,6 +24,8 @@
 //! A few whitelisted exceptions are allowed as there's known bugs in rustdoc,
 //! but this should catch the majority of "broken link" cases.
 
+#![feature(question_mark)]
+
 extern crate url;
 
 use std::env;
@@ -243,15 +245,14 @@ fn load_file(cache: &mut Cache,
             None
         }
         Entry::Vacant(entry) => {
-            let mut fp = try!(File::open(file.clone()).map_err(|err| {
+            let mut fp = File::open(file.clone()).map_err(|err| {
                 if let FromRedirect(true) = redirect {
                     LoadError::BrokenRedirect(file.clone(), err)
                 } else {
                     LoadError::IOError(err)
                 }
-            }));
-            try!(fp.read_to_string(&mut contents)
-                   .map_err(|err| LoadError::IOError(err)));
+            })?;
+            fp.read_to_string(&mut contents).map_err(|err| LoadError::IOError(err))?;
 
             let maybe = maybe_redirect(&contents);
             if maybe.is_some() {