bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #93142 - estebank:missing-main, r=wesleywiser

Browse source 
Do not point at whole file missing `fn main`

Only point at the end of the crate. We could try making it point at the
beginning of the crate, but that is confused with `DUMMY_SP`, causing
the output to be *worse*.

This change will make it so that VSCode will *not* underline the whole
file when `main` is missing, so other errors will be visible.
This commit is contained in:
bors 2022-03-05 02:46:24 +00:00
commit 8c93948d6e
19 changed files with 54 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_passes/src/entry.rs
View file

@ -218,9 +218,9 @@ fn no_main_err(tcx: TyCtxt<'_>, visitor: &EntryContext<'_, '_>) {
// The file may be empty, which leads to the diagnostic machinery not emitting this
// note. This is a relatively simple way to detect that case and emit a span-less
// note instead.
if tcx.sess.source_map().lookup_line(sp.lo()).is_ok() {
err.set_span(sp);
err.span_label(sp, &note);
if tcx.sess.source_map().lookup_line(sp.hi()).is_ok() {
err.set_span(sp.shrink_to_hi());
err.span_label(sp.shrink_to_hi(), &note);
} else {
err.note(&note);
}