diff options
| author | Adam Perry <adam.n.perry@gmail.com> | 2019-10-27 13:32:18 -0700 |
|---|---|---|
| committer | Adam Perry <adam.n.perry@gmail.com> | 2019-12-05 21:11:46 -0800 |
| commit | 28b22571609ef415ef974844982ba5f03c447ab4 (patch) | |
| tree | d65dbde31e3810d4eff0dc38f3a7b90481d8707a | |
| parent | eb679c9c5d57c88deaa313608af4011befc69605 (diff) | |
| download | rust-28b22571609ef415ef974844982ba5f03c447ab4.tar.gz rust-28b22571609ef415ef974844982ba5f03c447ab4.zip | |
Error message no longer implies #[track_caller] is a requirement for Rust ABI.
| -rw-r--r-- | src/librustc_typeck/collect.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 6d6e7685fa0..b9829793cbe 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -2616,7 +2616,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs { tcx.sess, attr.span, E0737, - "Rust ABI is required to use `#[track_caller]`" + "`#[track_caller]` requires Rust ABI" ).emit(); } codegen_fn_attrs.flags |= CodegenFnAttrFlags::TRACK_CALLER; diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs b/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs index 4d9618a3bb0..20d29619ba4 100644 --- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs +++ b/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs @@ -1,6 +1,7 @@ #![feature(track_caller)] -#[track_caller] //~ ERROR Rust ABI is required to use `#[track_caller]` +#[track_caller] extern "C" fn f() {} +//~^^ ERROR `#[track_caller]` requires Rust ABI fn main() {} diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr b/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr index bede0ea593c..2a3a4385c8b 100644 --- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr +++ b/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr @@ -1,4 +1,4 @@ -error[E0737]: Rust ABI is required to use `#[track_caller]` +error[E0737]: `#[track_caller]` requires Rust ABI --> $DIR/error-with-invalid-abi.rs:3:1 | LL | #[track_caller] |