fix bugs + review comments

1 files changed, 15 insertions, 14 deletions

diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs
index 0915600bb38..e155f3f7607 100644
--- a/src/tools/rustbook/src/main.rs
+++ b/src/tools/rustbook/src/main.rs
@@ -56,21 +56,22 @@ fn main() {
                 eprintln!("Error: {}", err);
 
                 // HACK: ignore timeouts
-                #[allow(unused_mut)]
-                let mut actually_broken = false;
-
-                #[cfg(feature = "linkcheck")]
-                {
-                    if let Ok(broken_links) = err.downcast::<BrokenLinks>() {
-                        for cause in broken_links.links().iter() {
-                            eprintln!("\tCaused By: {}", cause);
-
-                            if cause.contains("timed out") {
-                                actually_broken = true;
-                            }
-                        }
+                let actually_broken = {
+                    #[cfg(feature = "linkcheck")]
+                    {
+                        err.downcast::<BrokenLinks>()
+                            .unwrap_or(false)
+                            .links()
+                            .iter()
+                            .inspect(|cause| eprintln!("\tCaused By: {}", cause))
+                            .any(|cause| !cause.contains("timed out"));
                     }
-                }
+
+                    #[cfg(not(feature = "linkcheck"))]
+                    {
+                        false
+                    }
+                };
 
                 if actually_broken {
                     std::process::exit(101);