mirror of https://github.com/rust-lang/rust.git
Revert "Revert "Don't load all extern crates unconditionally""
This reverts commit 5f0c54db4e
.
This commit is contained in:
parent
99b73e81b3
commit
d933edd5c6
|
@ -1,12 +1,12 @@
|
||||||
|
use rustc_ast as ast;
|
||||||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||||
use rustc_data_structures::sync::{self, Lrc};
|
use rustc_data_structures::sync::{self, Lrc};
|
||||||
use rustc_driver::abort_on_err;
|
use rustc_driver::abort_on_err;
|
||||||
use rustc_errors::emitter::{Emitter, EmitterWriter};
|
use rustc_errors::emitter::{Emitter, EmitterWriter};
|
||||||
use rustc_errors::json::JsonEmitter;
|
use rustc_errors::json::JsonEmitter;
|
||||||
use rustc_feature::UnstableFeatures;
|
use rustc_feature::UnstableFeatures;
|
||||||
use rustc_hir::def::Namespace::TypeNS;
|
|
||||||
use rustc_hir::def::Res;
|
use rustc_hir::def::Res;
|
||||||
use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX};
|
use rustc_hir::def_id::{DefId, LocalDefId};
|
||||||
use rustc_hir::HirId;
|
use rustc_hir::HirId;
|
||||||
use rustc_hir::{
|
use rustc_hir::{
|
||||||
intravisit::{self, NestedVisitorMap, Visitor},
|
intravisit::{self, NestedVisitorMap, Visitor},
|
||||||
|
@ -23,7 +23,7 @@ use rustc_session::DiagnosticOutput;
|
||||||
use rustc_session::Session;
|
use rustc_session::Session;
|
||||||
use rustc_span::source_map;
|
use rustc_span::source_map;
|
||||||
use rustc_span::symbol::sym;
|
use rustc_span::symbol::sym;
|
||||||
use rustc_span::{Span, DUMMY_SP};
|
use rustc_span::Span;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
@ -301,41 +301,16 @@ crate fn create_config(
|
||||||
}
|
}
|
||||||
|
|
||||||
crate fn create_resolver<'a>(
|
crate fn create_resolver<'a>(
|
||||||
externs: config::Externs,
|
|
||||||
queries: &Queries<'a>,
|
queries: &Queries<'a>,
|
||||||
sess: &Session,
|
sess: &Session,
|
||||||
) -> Rc<RefCell<interface::BoxedResolver>> {
|
) -> Rc<RefCell<interface::BoxedResolver>> {
|
||||||
let extern_names: Vec<String> = externs
|
let (krate, resolver, _) = &*abort_on_err(queries.expansion(), sess).peek();
|
||||||
.iter()
|
let resolver = resolver.clone();
|
||||||
.filter(|(_, entry)| entry.add_prelude)
|
|
||||||
.map(|(name, _)| name)
|
|
||||||
.cloned()
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let (_, resolver, _) = &*abort_on_err(queries.expansion(), sess).peek();
|
let mut loader = crate::passes::collect_intra_doc_links::IntraLinkCrateLoader::new(resolver);
|
||||||
|
ast::visit::walk_crate(&mut loader, krate);
|
||||||
|
|
||||||
// Before we actually clone it, let's force all the extern'd crates to
|
loader.resolver
|
||||||
// actually be loaded, just in case they're only referred to inside
|
|
||||||
// intra-doc links
|
|
||||||
resolver.borrow_mut().access(|resolver| {
|
|
||||||
sess.time("load_extern_crates", || {
|
|
||||||
for extern_name in &extern_names {
|
|
||||||
debug!("loading extern crate {}", extern_name);
|
|
||||||
if let Err(()) = resolver
|
|
||||||
.resolve_str_path_error(
|
|
||||||
DUMMY_SP,
|
|
||||||
extern_name,
|
|
||||||
TypeNS,
|
|
||||||
LocalDefId { local_def_index: CRATE_DEF_INDEX }.to_def_id(),
|
|
||||||
) {
|
|
||||||
warn!("unable to resolve external crate {} (do you have an unused `--extern` crate?)", extern_name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Now we're good to clone the resolver because everything should be loaded
|
|
||||||
resolver.clone()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
crate fn run_global_ctxt(
|
crate fn run_global_ctxt(
|
||||||
|
|
|
@ -30,6 +30,7 @@ extern crate tracing;
|
||||||
// Dependencies listed in Cargo.toml do not need `extern crate`.
|
// Dependencies listed in Cargo.toml do not need `extern crate`.
|
||||||
|
|
||||||
extern crate rustc_ast;
|
extern crate rustc_ast;
|
||||||
|
extern crate rustc_ast_lowering;
|
||||||
extern crate rustc_ast_pretty;
|
extern crate rustc_ast_pretty;
|
||||||
extern crate rustc_attr;
|
extern crate rustc_attr;
|
||||||
extern crate rustc_data_structures;
|
extern crate rustc_data_structures;
|
||||||
|
@ -724,7 +725,6 @@ fn main_options(options: config::Options) -> MainResult {
|
||||||
let default_passes = options.default_passes;
|
let default_passes = options.default_passes;
|
||||||
let output_format = options.output_format;
|
let output_format = options.output_format;
|
||||||
// FIXME: fix this clone (especially render_options)
|
// FIXME: fix this clone (especially render_options)
|
||||||
let externs = options.externs.clone();
|
|
||||||
let manual_passes = options.manual_passes.clone();
|
let manual_passes = options.manual_passes.clone();
|
||||||
let render_options = options.render_options.clone();
|
let render_options = options.render_options.clone();
|
||||||
let config = core::create_config(options);
|
let config = core::create_config(options);
|
||||||
|
@ -742,7 +742,7 @@ fn main_options(options: config::Options) -> MainResult {
|
||||||
// We need to hold on to the complete resolver, so we cause everything to be
|
// We need to hold on to the complete resolver, so we cause everything to be
|
||||||
// cloned for the analysis passes to use. Suboptimal, but necessary in the
|
// cloned for the analysis passes to use. Suboptimal, but necessary in the
|
||||||
// current architecture.
|
// current architecture.
|
||||||
let resolver = core::create_resolver(externs, queries, &sess);
|
let resolver = core::create_resolver(queries, &sess);
|
||||||
|
|
||||||
if sess.has_errors() {
|
if sess.has_errors() {
|
||||||
sess.fatal("Compilation failed, aborting rustdoc");
|
sess.fatal("Compilation failed, aborting rustdoc");
|
||||||
|
|
|
@ -37,6 +37,9 @@ use crate::html::markdown::{markdown_links, MarkdownLink};
|
||||||
use crate::lint::{BROKEN_INTRA_DOC_LINKS, PRIVATE_INTRA_DOC_LINKS};
|
use crate::lint::{BROKEN_INTRA_DOC_LINKS, PRIVATE_INTRA_DOC_LINKS};
|
||||||
use crate::passes::Pass;
|
use crate::passes::Pass;
|
||||||
|
|
||||||
|
mod early;
|
||||||
|
crate use early::IntraLinkCrateLoader;
|
||||||
|
|
||||||
crate const COLLECT_INTRA_DOC_LINKS: Pass = Pass {
|
crate const COLLECT_INTRA_DOC_LINKS: Pass = Pass {
|
||||||
name: "collect-intra-doc-links",
|
name: "collect-intra-doc-links",
|
||||||
run: collect_intra_doc_links,
|
run: collect_intra_doc_links,
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
use rustc_ast as ast;
|
||||||
|
use rustc_hir::def::Namespace::TypeNS;
|
||||||
|
use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX};
|
||||||
|
use rustc_interface::interface;
|
||||||
|
|
||||||
|
use std::cell::RefCell;
|
||||||
|
use std::mem;
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
// Letting the resolver escape at the end of the function leads to inconsistencies between the
|
||||||
|
// crates the TyCtxt sees and the resolver sees (because the resolver could load more crates
|
||||||
|
// after escaping). Hopefully `IntraLinkCrateLoader` gets all the crates we need ...
|
||||||
|
crate struct IntraLinkCrateLoader {
|
||||||
|
current_mod: DefId,
|
||||||
|
crate resolver: Rc<RefCell<interface::BoxedResolver>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IntraLinkCrateLoader {
|
||||||
|
crate fn new(resolver: Rc<RefCell<interface::BoxedResolver>>) -> Self {
|
||||||
|
let crate_id = LocalDefId { local_def_index: CRATE_DEF_INDEX }.to_def_id();
|
||||||
|
Self { current_mod: crate_id, resolver }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ast::visit::Visitor<'_> for IntraLinkCrateLoader {
|
||||||
|
fn visit_attribute(&mut self, attr: &ast::Attribute) {
|
||||||
|
use crate::html::markdown::markdown_links;
|
||||||
|
use crate::passes::collect_intra_doc_links::preprocess_link;
|
||||||
|
|
||||||
|
if let Some(doc) = attr.doc_str() {
|
||||||
|
for link in markdown_links(&doc.as_str()) {
|
||||||
|
let path_str = if let Some(Ok(x)) = preprocess_link(&link) {
|
||||||
|
x.path_str
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
self.resolver.borrow_mut().access(|resolver| {
|
||||||
|
let _ = resolver.resolve_str_path_error(
|
||||||
|
attr.span,
|
||||||
|
&path_str,
|
||||||
|
TypeNS,
|
||||||
|
self.current_mod,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ast::visit::walk_attribute(self, attr);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn visit_item(&mut self, item: &ast::Item) {
|
||||||
|
use rustc_ast_lowering::ResolverAstLowering;
|
||||||
|
|
||||||
|
if let ast::ItemKind::Mod(..) = item.kind {
|
||||||
|
let new_mod =
|
||||||
|
self.resolver.borrow_mut().access(|resolver| resolver.local_def_id(item.id));
|
||||||
|
let old_mod = mem::replace(&mut self.current_mod, new_mod.to_def_id());
|
||||||
|
ast::visit::walk_item(self, item);
|
||||||
|
self.current_mod = old_mod;
|
||||||
|
} else {
|
||||||
|
ast::visit::walk_item(self, item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -30,7 +30,7 @@ crate use self::unindent_comments::UNINDENT_COMMENTS;
|
||||||
mod propagate_doc_cfg;
|
mod propagate_doc_cfg;
|
||||||
crate use self::propagate_doc_cfg::PROPAGATE_DOC_CFG;
|
crate use self::propagate_doc_cfg::PROPAGATE_DOC_CFG;
|
||||||
|
|
||||||
mod collect_intra_doc_links;
|
crate mod collect_intra_doc_links;
|
||||||
crate use self::collect_intra_doc_links::COLLECT_INTRA_DOC_LINKS;
|
crate use self::collect_intra_doc_links::COLLECT_INTRA_DOC_LINKS;
|
||||||
|
|
||||||
mod doc_test_lints;
|
mod doc_test_lints;
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
// no-prefer-dynamic
|
||||||
|
#![crate_type = "lib"]
|
||||||
|
#![no_std]
|
||||||
|
#![feature(lang_items)]
|
||||||
|
|
||||||
|
use core::panic::PanicInfo;
|
||||||
|
use core::sync::atomic::{self, Ordering};
|
||||||
|
|
||||||
|
#[panic_handler]
|
||||||
|
fn panic(_info: &PanicInfo) -> ! {
|
||||||
|
loop {
|
||||||
|
atomic::compiler_fence(Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[lang = "eh_personality"]
|
||||||
|
fn foo() {}
|
|
@ -0,0 +1,3 @@
|
||||||
|
// check-pass
|
||||||
|
// aux-crate:panic_item=panic-item.rs
|
||||||
|
// @has unused_extern_crate/index.html
|
|
@ -1,2 +0,0 @@
|
||||||
/// This will be referred to by the test docstring
|
|
||||||
pub struct Something;
|
|
|
@ -1,4 +1,4 @@
|
||||||
// aux-crate:priv:issue_66159_1=issue-66159-1.rs
|
// aux-crate:priv:pub_struct=pub-struct.rs
|
||||||
// compile-flags:-Z unstable-options
|
// compile-flags:-Z unstable-options
|
||||||
|
|
||||||
// The issue was an ICE which meant that we never actually generated the docs
|
// The issue was an ICE which meant that we never actually generated the docs
|
||||||
|
@ -7,4 +7,4 @@
|
||||||
// verify that the struct is linked correctly.
|
// verify that the struct is linked correctly.
|
||||||
|
|
||||||
// @has issue_66159/index.html
|
// @has issue_66159/index.html
|
||||||
//! [issue_66159_1::Something]
|
//! [pub_struct::SomeStruct]
|
Loading…
Reference in New Issue