Auto merge of #38773 - sanxiyn:rustdoc-ice, r=steveklabnik

Avoid rustdoc ICE when an unstable feature is used Fix #36159.
rust-lang · Jan 4, 2017 · 9c0e373 · 9c0e373
2 parents e06ce71 + 6319558
commit 9c0e373
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
@@ -156,9 +156,15 @@ pub fn run_core(search_paths: SearchPaths,
     let name = link::find_crate_name(Some(&sess), &krate.attrs, &input);
 
     let driver::ExpansionResult { defs, analysis, resolutions, mut hir_forest, .. } = {
-        driver::phase_2_configure_and_expand(
-            &sess, &cstore, krate, None, &name, None, resolve::MakeGlobMap::No, |_| Ok(()),
-        ).expect("phase_2_configure_and_expand aborted in rustdoc!")
+        let result = driver::phase_2_configure_and_expand(&sess,
+                                                          &cstore,
+                                                          krate,
+                                                          None,
+                                                          &name,
+                                                          None,
+                                                          resolve::MakeGlobMap::No,
+                                                          |_| Ok(()));
+        abort_on_err(result, &sess)
     };
 
     let arena = DroplessArena::new();