rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Address review comments

Browse Source 
- Move static variables into the innermost scope in which they are used
- Clean up comments
- Remove external_providers; rename local_providers -> providers
This commit is contained in:
Joshua Nelson
2020-07-11 21:50:25 -04:00
parent ac9157b482
commit 6eec9fb5d1
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/librustdoc/core.rs
View File

@@ -377,18 +377,26 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
crate_name, crate_name,
lint_caps, lint_caps,
register_lints: None, register_lints: None,
override_queries: Some(|_sess, local_providers, external_providers| { override_queries: Some(|_sess, providers, _external_providers| {
lazy_static! {
static ref EMPTY_SET: FxHashSet<LocalDefId> = FxHashSet::default();
}
// Most lints will require typechecking, so just don't run them. // Most lints will require typechecking, so just don't run them.
local_providers.lint_mod = |_, _| {}; providers.lint_mod = |_, _| {};
external_providers.lint_mod = |_, _| {}; // Prevent `rustc_typeck::check_crate` from calling `typeck_tables_of` on all bodies.
local_providers.typeck_item_bodies = |_, _| {}; providers.typeck_item_bodies = |_, _| {};
// hack so that `used_trait_imports` won't try to call typeck_tables_of // hack so that `used_trait_imports` won't try to call typeck_tables_of
local_providers.used_trait_imports = |_, _| &EMPTY_SET; providers.used_trait_imports = |_, _| {
lazy_static! {
static ref EMPTY_SET: FxHashSet<LocalDefId> = FxHashSet::default();
}
&EMPTY_SET
};
// In case typeck does end up being called, don't ICE in case there were name resolution errors // In case typeck does end up being called, don't ICE in case there were name resolution errors
local_providers.typeck_tables_of = move |tcx, def_id| { providers.typeck_tables_of = move |tcx, def_id| {
thread_local!(static DEFAULT_TYPECK: for<'tcx> fn(TyCtxt<'tcx>, LocalDefId) -> &'tcx ty::TypeckTables<'tcx> = {
let mut providers = ty::query::Providers::default();
rustc_typeck::provide(&mut providers);
providers.typeck_tables_of
});
// Closures' tables come from their outermost function, // Closures' tables come from their outermost function,
// as they are part of the same "inference environment". // as they are part of the same "inference environment".
// This avoids emitting errors for the parent twice (see similar code in `typeck_tables_of_with_fallback`) // This avoids emitting errors for the parent twice (see similar code in `typeck_tables_of_with_fallback`)
@@ -447,10 +455,11 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
let mut global_ctxt = abort_on_err(queries.global_ctxt(), sess).take(); let mut global_ctxt = abort_on_err(queries.global_ctxt(), sess).take();
global_ctxt.enter(|tcx| { global_ctxt.enter(|tcx| {
// Some queries require that they only run on valid types: // Certain queries assume that some checks were run elsewhere
// https://github.com/rust-lang/rust/pull/73566#issuecomment-656954425 // (see https://github.com/rust-lang/rust/pull/73566#issuecomment-656954425),
// Therefore typecheck this crate before running lints. // so type-check everything other than function bodies in this crate before running lints.
// NOTE: this does not typeck item bodies or run the default rustc lints // NOTE: this does not call `tcx.analysis()` so that we won't
// typeck function bodies or run the default rustc lints.
// (see `override_queries` in the `config`) // (see `override_queries` in the `config`)
let _ = rustc_typeck::check_crate(tcx); let _ = rustc_typeck::check_crate(tcx);
tcx.sess.abort_if_errors(); tcx.sess.abort_if_errors();
@@ -607,12 +616,6 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
}) })
} }
thread_local!(static DEFAULT_TYPECK: for<'tcx> fn(TyCtxt<'tcx>, LocalDefId) -> &'tcx ty::TypeckTables<'tcx> = {
let mut providers = ty::query::Providers::default();
rustc_typeck::provide(&mut providers);
providers.typeck_tables_of
});
/// Due to https://github.com/rust-lang/rust/pull/73566, /// Due to https://github.com/rust-lang/rust/pull/73566,
/// the name resolution pass may find errors that are never emitted. /// the name resolution pass may find errors that are never emitted.
/// If typeck is called after this happens, then we'll get an ICE: /// If typeck is called after this happens, then we'll get an ICE: