Rename stable_mir::Safety to stable_mir::Unsafe

rust-lang · Apr 29, 2024 · c2f4e85 · c2f4e85
1 parent 9084601
commit c2f4e85
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/compiler/rustc_smir/src/rustc_internal/internal.rs b/compiler/rustc_smir/src/rustc_internal/internal.rs
@@ -10,7 +10,7 @@ use rustc_span::Symbol;
 use stable_mir::abi::Layout;
 use stable_mir::mir::alloc::AllocId;
 use stable_mir::mir::mono::{Instance, MonoItem, StaticDef};
-use stable_mir::mir::{BinOp, Mutability, Place, ProjectionElem, Safety};
+use stable_mir::mir::{BinOp, Mutability, Place, ProjectionElem, Unsafe};
 use stable_mir::ty::{
     Abi, AdtDef, Binder, BoundRegionKind, BoundTyKind, BoundVariableKind, ClosureKind, Const,
     DynKind, ExistentialPredicate, ExistentialProjection, ExistentialTraitRef, FloatTy, FnSig,
@@ -480,13 +480,13 @@ impl RustcInternal for Abi {
     }
 }
 
-impl RustcInternal for Safety {
+impl RustcInternal for Unsafe {
     type T<'tcx> = rustc_hir::Unsafety;
 
     fn internal<'tcx>(&self, _tables: &mut Tables<'_>, _tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
         match self {
-            Safety::Unsafe => rustc_hir::Unsafety::Unsafe,
-            Safety::Normal => rustc_hir::Unsafety::Normal,
+            Unsafe::Yes => rustc_hir::Unsafety::Unsafe,
+            Unsafe::No => rustc_hir::Unsafety::Normal,
         }
     }
 }

diff --git a/compiler/rustc_smir/src/rustc_smir/convert/mod.rs b/compiler/rustc_smir/src/rustc_smir/convert/mod.rs
@@ -10,11 +10,11 @@ mod mir;
 mod ty;
 
 impl<'tcx> Stable<'tcx> for rustc_hir::Unsafety {
-    type T = stable_mir::mir::Safety;
+    type T = stable_mir::mir::Unsafe;
     fn stable(&self, _: &mut Tables<'_>) -> Self::T {
         match self {
-            rustc_hir::Unsafety::Unsafe => stable_mir::mir::Safety::Unsafe,
-            rustc_hir::Unsafety::Normal => stable_mir::mir::Safety::Normal,
+            rustc_hir::Unsafety::Unsafe => stable_mir::mir::Unsafe::Yes,
+            rustc_hir::Unsafety::Normal => stable_mir::mir::Unsafe::No,
         }
     }
 }

diff --git a/compiler/stable_mir/src/mir/body.rs b/compiler/stable_mir/src/mir/body.rs
@@ -914,9 +914,9 @@ pub enum Mutability {
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum Safety {
-    Unsafe,
-    Normal,
+pub enum Unsafe {
+    Yes,
+    No,
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -929,7 +929,7 @@ pub enum PointerCoercion {
 
     /// Go from a non-capturing closure to a fn pointer or an unsafe fn pointer.
     /// It cannot convert a closure that requires unsafe.
-    ClosureFnPointer(Safety),
+    ClosureFnPointer(Unsafe),
 
     /// Go from a mut raw pointer to a const raw pointer.
     MutToConstPointer,

diff --git a/compiler/stable_mir/src/ty.rs b/compiler/stable_mir/src/ty.rs
@@ -1,5 +1,5 @@
 use super::{
-    mir::Safety,
+    mir::Unsafe,
     mir::{Body, Mutability},
     with, DefId, Error, Symbol,
 };
@@ -903,7 +903,7 @@ pub type PolyFnSig = Binder<FnSig>;
 pub struct FnSig {
     pub inputs_and_output: Vec<Ty>,
     pub c_variadic: bool,
-    pub unsafety: Safety,
+    pub unsafety: Unsafe,
     pub abi: Abi,
 }
 
@@ -1194,7 +1194,7 @@ pub enum TraitSpecializationKind {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct TraitDecl {
     pub def_id: TraitDef,
-    pub unsafety: Safety,
+    pub unsafety: Unsafe,
     pub paren_sugar: bool,
     pub has_auto_impl: bool,
     pub is_marker: bool,