OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Avoid rustdoc ICE when an unstable feature is used

Fix #36159.
This commit is contained in:
bors 2017-01-04 09:24:24 +00:00
commit 9c0e373f91
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/core.rs
View File

@ -156,9 +156,15 @@ pub fn run_core(search_paths: SearchPaths,
let name = link::find_crate_name(Some(&sess), &krate.attrs, &input); let name = link::find_crate_name(Some(&sess), &krate.attrs, &input);
let driver::ExpansionResult { defs, analysis, resolutions, mut hir_forest, .. } = { let driver::ExpansionResult { defs, analysis, resolutions, mut hir_forest, .. } = {
driver::phase_2_configure_and_expand( let result = driver::phase_2_configure_and_expand(&sess,
&sess, &cstore, krate, None, &name, None, resolve::MakeGlobMap::No, |_| Ok(()), &cstore,
).expect("phase_2_configure_and_expand aborted in rustdoc!") krate,
None,
&name,
None,
resolve::MakeGlobMap::No,
|_| Ok(()));
abort_on_err(result, &sess)
}; };
let arena = DroplessArena::new(); let arena = DroplessArena::new();