user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #75130 - lcnr:array_chunks, r=ecstatic-morse

Browse source 
forbid `#[track_caller]` on main

fixes #75125

cc @anp
This commit is contained in:
bors 2020-08-05 01:13:19 +00:00
commit 32d14eba47
7 changed files with 75 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/librustc_typeck/lib.rs
View file

@ -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::{
@ -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;
}
@ -268,12 +285,29 @@ fn check_start_fn_ty(tcx: TyCtxt<'_>, start_def_id: LocalDefId) {
tcx.sess,
span,
E0752,
"start is not allowed to be `async`"
"`start` is not allowed to be `async`"
)
.span_label(span, "start is not allowed to be `async`")
.span_label(span, "`start` is not allowed to be `async`")
.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;
}

2
src/test/ui/async-await/issue-68523-start.rs
View file

@ -4,6 +4,6 @@
#[start]
pub async fn start(_: isize, _: *const *const u8) -> isize {
//~^ ERROR start is not allowed to be `async`
//~^ ERROR `start` is not allowed to be `async`
0
}

4
src/test/ui/async-await/issue-68523-start.stderr
View file

@ -1,8 +1,8 @@
error[E0752]: start is not allowed to be `async`
error[E0752]: `start` is not allowed to be `async`
--> $DIR/issue-68523-start.rs:6:1
|
LL | pub async fn start(_: isize, _: *const *const u8) -> isize {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ start is not allowed to be `async`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `start` is not allowed to be `async`
error: aborting due to previous error

4
src/test/ui/rfc-2091-track-caller/error-with-main.rs Normal file
View file

@ -0,0 +1,4 @@
#[track_caller] //~ ERROR `main` function is not allowed to be
fn main() {
panic!("{}: oh no", std::panic::Location::caller());
}

12
src/test/ui/rfc-2091-track-caller/error-with-main.stderr Normal file
View file

@ -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
src/test/ui/rfc-2091-track-caller/error-with-start.rs Normal file
View file

@ -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
src/test/ui/rfc-2091-track-caller/error-with-start.stderr Normal file
View file

@ -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