bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Merge check_for_entry_fn fully into check_mod_type_wf

Browse source
This commit is contained in:
Oli Scherer 2023-10-30 15:12:45 +00:00
parent cd4c352fb4
commit 5b13dc71cd
5 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/check/entry.rs
View file

@ -14,7 +14,7 @@ use std::ops::Not;
use super::check_function_signature;
use crate::errors;
pub(crate) fn check_for_entry_fn(tcx: TyCtxt<'_>, (): ()) {
pub(crate) fn check_for_entry_fn(tcx: TyCtxt<'_>) {
match tcx.entry_fn(()) {
Some((def_id, EntryFnType::Main { .. })) => check_main_fn_ty(tcx, def_id),
Some((def_id, EntryFnType::Start)) => check_start_fn_ty(tcx, def_id),

2
compiler/rustc_hir_analysis/src/check/mod.rs
View file

@ -75,7 +75,6 @@ pub use check::check_abi;
use std::num::NonZeroU32;
use entry::check_for_entry_fn;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_errors::ErrorGuaranteed;
use rustc_errors::{pluralize, struct_span_err, Diagnostic, DiagnosticBuilder};
@ -110,7 +109,6 @@ pub fn provide(providers: &mut Providers) {
wfcheck::provide(providers);
*providers = Providers {
adt_destructor,
check_for_entry_fn,
region_scope_tree,
collect_return_position_impl_trait_in_trait_tys,
compare_impl_const: compare_impl_item::compare_impl_const_raw,

6
compiler/rustc_hir_analysis/src/check/wfcheck.rs
View file

@ -1913,7 +1913,11 @@ fn check_mod_type_wf(tcx: TyCtxt<'_>, module: LocalModDefId) -> Result<(), Error
let mut res = items.par_items(|item| tcx.ensure().check_well_formed(item.owner_id));
res = res.and(items.par_impl_items(|item| tcx.ensure().check_well_formed(item.owner_id)));
res = res.and(items.par_trait_items(|item| tcx.ensure().check_well_formed(item.owner_id)));
res.and(items.par_foreign_items(|item| tcx.ensure().check_well_formed(item.owner_id)))
res = res.and(items.par_foreign_items(|item| tcx.ensure().check_well_formed(item.owner_id)));
if module == LocalModDefId::CRATE_DEF_ID {
super::entry::check_for_entry_fn(tcx);
}
res
}
fn error_392(tcx: TyCtxt<'_>, span: Span, param_name: Symbol) -> DiagnosticBuilder<'_> {

9
compiler/rustc_hir_analysis/src/lib.rs
View file

@ -200,14 +200,9 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
})?;
}
let errs = tcx.sess.time("wf_checking", || {
tcx.sess.time("wf_checking", || {
tcx.hir().try_par_for_each_module(|module| tcx.ensure().check_mod_type_wf(module))
});
tcx.sess.time("entry_fn_checks", || tcx.ensure().check_for_entry_fn(()));
// HACK: `check_for_entry_fn` wants to report its errors even if `check_mod_type_wf` has errored.
errs?;
})?;
if tcx.features().rustc_attrs {
tcx.sess.track_errors(|| collect::test_opaque_hidden_types(tcx))?;