mirror of https://github.com/rust-lang/rust.git
Rollup merge of #51368 - varkor:panic_implementation-closures, r=eddyb
Fix the use of closures within #[panic_implementation] Fixes #51365.
This commit is contained in:
commit
6c73943001
|
@ -1131,7 +1131,7 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
|
|||
|
||||
// Check that a function marked as `#[panic_implementation]` has signature `fn(&PanicInfo) -> !`
|
||||
if let Some(panic_impl_did) = fcx.tcx.lang_items().panic_impl() {
|
||||
if panic_impl_did == fn_hir_id.owner_def_id() {
|
||||
if panic_impl_did == fcx.tcx.hir.local_def_id(fn_id) {
|
||||
if let Some(panic_info_did) = fcx.tcx.lang_items().panic_info() {
|
||||
if declared_ret_ty.sty != ty::TyNever {
|
||||
fcx.tcx.sess.span_err(
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// compile-pass
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
#![no_std]
|
||||
#![feature(panic_implementation)]
|
||||
|
||||
#[panic_implementation]
|
||||
pub fn panic_fmt(_: &::core::panic::PanicInfo) -> ! {
|
||||
|x: u8| x;
|
||||
loop {}
|
||||
}
|
Loading…
Reference in New Issue