bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

reject fn panic_impl<T>(_: &PanicInfo) -> !

Browse source
This commit is contained in:
Jorge Aparicio 2018-05-29 11:23:00 +02:00
parent 4c84d382ed
commit da2ee5dcb2
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_typeck/check/mod.rs
View file

@ -130,7 +130,7 @@ use syntax_pos::{self, BytePos, Span, MultiSpan};
use rustc::hir::intravisit::{self, Visitor, NestedVisitorMap};
use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::hir::map::Node;
use rustc::hir::{self, PatKind};
use rustc::hir::{self, PatKind, Item_};
use rustc::middle::lang_items;
mod autoderef;
@ -1133,7 +1133,7 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
if let Some(panic_impl_did) = fcx.tcx.lang_items().panic_impl() {
if panic_impl_did == fn_hir_id.owner_def_id() {
if let Some(panic_info_did) = fcx.tcx.lang_items().panic_info() {
if ret_ty.sty != ty::TyNever {
if declared_ret_ty.sty != ty::TyNever {
fcx.tcx.sess.span_err(
decl.output.span(),
"return type should be `!`",
@ -1161,6 +1161,17 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
"argument should be `&PanicInfo`",
);
}
if let Node::NodeItem(item) = fcx.tcx.hir.get(fn_id) {
if let Item_::ItemFn(_, _, _, _, ref generics, _) = item.node {
if !generics.params.is_empty() {
fcx.tcx.sess.span_err(
span,
"`#[panic_implementation]` function should have no type parameters",
);
}
}
}
} else {
fcx.tcx.sess.span_err(span, "function should have one argument");
}

23
src/test/compile-fail/panic-implementation-bad-signature-4.rs Normal file
View file

@ -0,0 +1,23 @@
// 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-flags:-C panic=abort
#![feature(panic_implementation)]
#![no_std]
#![no_main]
use core::panic::PanicInfo;
#[panic_implementation]
fn panic<T>(pi: &PanicInfo) -> ! {
//~^ ERROR `#[panic_implementation]` function should have no type parameters
loop {}
}