]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #33702 - crimsun:pr33678, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 May 2016 12:48:11 +0000 (05:48 -0700)
committerbors <bors@rust-lang.org>
Thu, 19 May 2016 12:48:11 +0000 (05:48 -0700)
Resolved rustdoc crash (#33678) by aborting instead of unwrapping.

Also removed Option use and comment to match.

Fixes https://github.com/rust-lang/rust/issues/33678

1  2 
src/librustdoc/core.rs

index 4ae869c325976f0dcd5146a3c094093f42e74348,802500233edb54ebb489fdd4d0a5e3f9fe3bce39..61985d390801bd132e9fae4423e201343a38487a
@@@ -173,11 -172,11 +173,10 @@@ pub fn run_core(search_paths: SearchPat
                                                       &arenas,
                                                       &name,
                                                       |tcx, _, analysis, result| {
-         // Return if the driver hit an err (in `result`)
          if let Err(_) = result {
-             return None
+             sess.fatal("Compilation failed, aborting rustdoc");
          }
  
 -        let _ignore = tcx.dep_graph.in_ignore();
          let ty::CrateAnalysis { access_levels, .. } = analysis;
  
          // Convert from a NodeId set to a DefId set since we don't always have easy access