Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
forbid #[track_caller] on main
  • Loading branch information
lcnr committed Aug 4, 2020
1 parent d51b71a commit 06dbd06
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 1 deletion.
36 changes: 35 additions & 1 deletion src/librustc_typeck/lib.rs
Expand Up @@ -100,7 +100,7 @@ use rustc_middle::ty::query::Providers;
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_middle::util;
use rustc_session::config::EntryFnType;
use rustc_span::{Span, DUMMY_SP};
use rustc_span::{symbol::sym, Span, DUMMY_SP};
use rustc_target::spec::abi::Abi;
use rustc_trait_selection::traits::error_reporting::InferCtxtExt as _;
use rustc_trait_selection::traits::{
Expand Down Expand Up @@ -194,6 +194,23 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: LocalDefId) {
.emit();
error = true;
}

for attr in it.attrs {
if attr.check_name(sym::track_caller) {
tcx.sess
.struct_span_err(
attr.span,
"`main` function is not allowed to be `#[track_caller]`",
)
.span_label(
main_span,
"`main` function is not allowed to be `#[track_caller]`",
)
.emit();
error = true;
}
}

if error {
return;
}
Expand Down Expand Up @@ -274,6 +291,23 @@ fn check_start_fn_ty(tcx: TyCtxt<'_>, start_def_id: LocalDefId) {
.emit();
error = true;
}

for attr in it.attrs {
if attr.check_name(sym::track_caller) {
tcx.sess
.struct_span_err(
attr.span,
"start is not allowed to be `#[track_caller]`",
)
.span_label(
start_span,
"start is not allowed to be `#[track_caller]`",
)
.emit();
error = true;
}
}

if error {
return;
}
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/rfc-2091-track-caller/error-with-main.rs
@@ -0,0 +1,4 @@
#[track_caller] //~ ERROR `main` function is not allowed to be
fn main() {
panic!("{}: oh no", std::panic::Location::caller());
}
12 changes: 12 additions & 0 deletions src/test/ui/rfc-2091-track-caller/error-with-main.stderr
@@ -0,0 +1,12 @@
error: `main` function is not allowed to be `#[track_caller]`
--> $DIR/error-with-main.rs:1:1
|
LL | #[track_caller]
| ^^^^^^^^^^^^^^^
LL | / fn main() {
LL | | panic!("{}: oh no", std::panic::Location::caller());
LL | | }
| |_- `main` function is not allowed to be `#[track_caller]`

error: aborting due to previous error

7 changes: 7 additions & 0 deletions src/test/ui/rfc-2091-track-caller/error-with-start.rs
@@ -0,0 +1,7 @@
#![feature(start)]

#[start]
#[track_caller] //~ ERROR start is not allowed to be `#[track_caller]`
fn start(_argc: isize, _argv: *const *const u8) -> isize {
panic!("{}: oh no", std::panic::Location::caller());
}
12 changes: 12 additions & 0 deletions src/test/ui/rfc-2091-track-caller/error-with-start.stderr
@@ -0,0 +1,12 @@
error: start is not allowed to be `#[track_caller]`
--> $DIR/error-with-start.rs:4:1
|
LL | #[track_caller]
| ^^^^^^^^^^^^^^^
LL | / fn start(_argc: isize, _argv: *const *const u8) -> isize {
LL | | panic!("{}: oh no", std::panic::Location::caller());
LL | | }
| |_- start is not allowed to be `#[track_caller]`

error: aborting due to previous error

0 comments on commit 06dbd06

Please sign in to comment.