bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove UnsafetyChecker

Browse source 
Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
This commit is contained in:
Miguel Guarniz 2022-04-28 13:34:49 -04:00
parent 7c3c588988
commit f47f39b95f
1 changed files with 139 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

133
compiler/rustc_typeck/src/coherence/unsafety.rs
View file

@ -3,36 +3,43 @@
use rustc_errors::struct_span_err; use rustc_errors::struct_span_err;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::itemlikevisit::ItemLikeVisitor; use rustc_hir::def::DefKind;
use rustc_hir::Unsafety; use rustc_hir::Unsafety;
use rustc_middle::ty::TyCtxt; use rustc_middle::ty::TyCtxt;
pub fn check(tcx: TyCtxt<'_>) { pub fn check(tcx: TyCtxt<'_>) {
let mut unsafety = UnsafetyChecker { tcx }; for id in tcx.hir().items() {
tcx.hir().visit_all_item_likes(&mut unsafety); if matches!(tcx.hir().def_kind(id.def_id), DefKind::Impl) {
let item = tcx.hir().item(id);
if let hir::ItemKind::Impl(ref impl_) = item.kind {
check_unsafety_coherence(
tcx,
item,
Some(&impl_.generics),
impl_.unsafety,
impl_.polarity,
);
}
}
}
} }
struct UnsafetyChecker<'tcx> { fn check_unsafety_coherence<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
}
impl<'tcx> UnsafetyChecker<'tcx> {
fn check_unsafety_coherence(
&mut self,
item: &hir::Item<'_>, item: &hir::Item<'_>,
impl_generics: Option<&hir::Generics<'_>>, impl_generics: Option<&hir::Generics<'_>>,
unsafety: hir::Unsafety, unsafety: hir::Unsafety,
polarity: hir::ImplPolarity, polarity: hir::ImplPolarity,
) { ) {
if let Some(trait_ref) = self.tcx.impl_trait_ref(item.def_id) { if let Some(trait_ref) = tcx.impl_trait_ref(item.def_id) {
let trait_def = self.tcx.trait_def(trait_ref.def_id); let trait_def = tcx.trait_def(trait_ref.def_id);
let unsafe_attr = impl_generics.and_then(|generics| { let unsafe_attr = impl_generics.and_then(|generics| {
generics.params.iter().find(|p| p.pure_wrt_drop).map(|_| "may_dangle") generics.params.iter().find(|p| p.pure_wrt_drop).map(|_| "may_dangle")
}); });
match (trait_def.unsafety, unsafe_attr, unsafety, polarity) { match (trait_def.unsafety, unsafe_attr, unsafety, polarity) {
(Unsafety::Normal, None, Unsafety::Unsafe, hir::ImplPolarity::Positive) => { (Unsafety::Normal, None, Unsafety::Unsafe, hir::ImplPolarity::Positive) => {
struct_span_err!( struct_span_err!(
self.tcx.sess, tcx.sess,
item.span, item.span,
E0199, E0199,
"implementing the trait `{}` is not unsafe", "implementing the trait `{}` is not unsafe",
@ -43,7 +50,7 @@ impl<'tcx> UnsafetyChecker<'tcx> {
(Unsafety::Unsafe, _, Unsafety::Normal, hir::ImplPolarity::Positive) => { (Unsafety::Unsafe, _, Unsafety::Normal, hir::ImplPolarity::Positive) => {
struct_span_err!( struct_span_err!(
self.tcx.sess, tcx.sess,
item.span, item.span,
E0200, E0200,
"the trait `{}` requires an `unsafe impl` declaration", "the trait `{}` requires an `unsafe impl` declaration",
@ -52,14 +59,9 @@ impl<'tcx> UnsafetyChecker<'tcx> {
.emit(); .emit();
} }
( (Unsafety::Normal, Some(attr_name), Unsafety::Normal, hir::ImplPolarity::Positive) => {
Unsafety::Normal,
Some(attr_name),
Unsafety::Normal,
hir::ImplPolarity::Positive,
) => {
struct_span_err!( struct_span_err!(
self.tcx.sess, tcx.sess,
item.span, item.span,
E0569, E0569,
"requires an `unsafe impl` declaration due to `#[{}]` attribute", "requires an `unsafe impl` declaration due to `#[{}]` attribute",
@ -70,7 +72,7 @@ impl<'tcx> UnsafetyChecker<'tcx> {
(_, _, Unsafety::Unsafe, hir::ImplPolarity::Negative(_)) => { (_, _, Unsafety::Unsafe, hir::ImplPolarity::Negative(_)) => {
// Reported in AST validation // Reported in AST validation
self.tcx.sess.delay_span_bug(item.span, "unsafe negative impl"); tcx.sess.delay_span_bug(item.span, "unsafe negative impl");
} }
(_, _, Unsafety::Normal, hir::ImplPolarity::Negative(_)) (_, _, Unsafety::Normal, hir::ImplPolarity::Negative(_))
| (Unsafety::Unsafe, _, Unsafety::Unsafe, hir::ImplPolarity::Positive) | (Unsafety::Unsafe, _, Unsafety::Unsafe, hir::ImplPolarity::Positive)
@ -81,23 +83,74 @@ impl<'tcx> UnsafetyChecker<'tcx> {
} }
} }
} }
}
impl<'tcx> ItemLikeVisitor<'_> for UnsafetyChecker<'tcx> { // struct UnsafetyChecker<'tcx> {
fn visit_item(&mut self, item: &hir::Item<'_>) { // tcx: TyCtxt<'tcx>,
if let hir::ItemKind::Impl(ref impl_) = item.kind { // }
self.check_unsafety_coherence( //
item, // impl<'tcx> UnsafetyChecker<'tcx> {
Some(&impl_.generics), // fn check_unsafety_coherence(
impl_.unsafety, // &mut self,
impl_.polarity, // item: &hir::Item<'_>,
); // impl_generics: Option<&hir::Generics<'_>>,
} // unsafety: hir::Unsafety,
} // polarity: hir::ImplPolarity,
// ) {
fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem<'_>) {} // if let Some(trait_ref) = self.tcx.impl_trait_ref(item.def_id) {
// let trait_def = self.tcx.trait_def(trait_ref.def_id);
fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {} // let unsafe_attr = impl_generics.and_then(|generics| {
// generics.params.iter().find(|p| p.pure_wrt_drop).map(|_| "may_dangle")
fn visit_foreign_item(&mut self, _foreign_item: &hir::ForeignItem<'_>) {} // });
} // match (trait_def.unsafety, unsafe_attr, unsafety, polarity) {
// (Unsafety::Normal, None, Unsafety::Unsafe, hir::ImplPolarity::Positive) => {
// struct_span_err!(
// self.tcx.sess,
// item.span,
// E0199,
// "implementing the trait `{}` is not unsafe",
// trait_ref.print_only_trait_path()
// )
// .emit();
// }
//
// (Unsafety::Unsafe, _, Unsafety::Normal, hir::ImplPolarity::Positive) => {
// struct_span_err!(
// self.tcx.sess,
// item.span,
// E0200,
// "the trait `{}` requires an `unsafe impl` declaration",
// trait_ref.print_only_trait_path()
// )
// .emit();
// }
//
// (
// Unsafety::Normal,
// Some(attr_name),
// Unsafety::Normal,
// hir::ImplPolarity::Positive,
// ) => {
// struct_span_err!(
// self.tcx.sess,
// item.span,
// E0569,
// "requires an `unsafe impl` declaration due to `#[{}]` attribute",
// attr_name
// )
// .emit();
// }
//
// (_, _, Unsafety::Unsafe, hir::ImplPolarity::Negative(_)) => {
// // Reported in AST validation
// self.tcx.sess.delay_span_bug(item.span, "unsafe negative impl");
// }
// (_, _, Unsafety::Normal, hir::ImplPolarity::Negative(_))
// | (Unsafety::Unsafe, _, Unsafety::Unsafe, hir::ImplPolarity::Positive)
// | (Unsafety::Normal, Some(_), Unsafety::Unsafe, hir::ImplPolarity::Positive)
// | (Unsafety::Normal, None, Unsafety::Normal, _) => {
// // OK
// }
// }
// }
// }
// }