diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-07-01 21:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 21:18:49 +0200 |
| commit | 87b714b61948e55acb1ef75557d42ad2c98f224e (patch) | |
| tree | 4edea8f7c8d0456af4697d8ca2d117ec1a45d44c /src/librustc/middle | |
| parent | 3f5d2fd8504a1f3b5351292840a9d0863e0622be (diff) | |
| parent | ee52862460000e89b29bfc9d57944b03904d0ff5 (diff) | |
| download | rust-87b714b61948e55acb1ef75557d42ad2c98f224e.tar.gz rust-87b714b61948e55acb1ef75557d42ad2c98f224e.zip | |
Rollup merge of #51921 - japaric:panic-impl-error, r=nagisa
improve the error message when `#[panic_implementation]` is missing closes #51341 r? @nagisa cc @phil-opp
Diffstat (limited to 'src/librustc/middle')
| -rw-r--r-- | src/librustc/middle/weak_lang_items.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/librustc/middle/weak_lang_items.rs b/src/librustc/middle/weak_lang_items.rs index 1d147eef054..180e75df1a6 100644 --- a/src/librustc/middle/weak_lang_items.rs +++ b/src/librustc/middle/weak_lang_items.rs @@ -112,9 +112,13 @@ fn verify<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, if missing.contains(&lang_items::$item) && !whitelisted(tcx, lang_items::$item) && items.$name().is_none() { - tcx.sess.err(&format!("language item required, but not found: `{}`", - stringify!($name))); - + if lang_items::$item == lang_items::PanicImplLangItem { + tcx.sess.err(&format!("`#[panic_implementation]` function required, \ + but not found")); + } else { + tcx.sess.err(&format!("language item required, but not found: `{}`", + stringify!($name))); + } } )* } |
