make reg public and add visit, fold

rust-lang · Sep 21, 2023 · db3cdb6 · db3cdb6
1 parent 1e2bde6
commit db3cdb6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/compiler/rustc_smir/src/stable_mir/fold.rs b/compiler/rustc_smir/src/stable_mir/fold.rs
@@ -4,7 +4,7 @@ use crate::rustc_internal::Opaque;
 
 use super::ty::{
     Allocation, Binder, Const, ConstDef, ConstantKind, ExistentialPredicate, FnSig, GenericArgKind,
-    GenericArgs, Promoted, RigidTy, TermKind, Ty, TyKind, UnevaluatedConst,
+    GenericArgs, Promoted, Region, RigidTy, TermKind, Ty, TyKind, UnevaluatedConst,
 };
 
 pub trait Folder: Sized {
@@ -106,6 +106,12 @@ impl Foldable for GenericArgs {
     }
 }
 
+impl Foldable for Region {
+    fn super_fold<V: Folder>(&self, _folder: &mut V) -> ControlFlow<V::Break, Self> {
+        ControlFlow::Continue(self.clone())
+    }
+}
+
 impl Foldable for GenericArgKind {
     fn super_fold<V: Folder>(&self, folder: &mut V) -> ControlFlow<V::Break, Self> {
         let mut this = self.clone();

diff --git a/compiler/rustc_smir/src/stable_mir/ty.rs b/compiler/rustc_smir/src/stable_mir/ty.rs
@@ -34,10 +34,13 @@ pub struct Const {
 }
 
 type Ident = Opaque;
-pub(crate) struct Region {
+
+#[derive(Debug, Clone)]
+pub struct Region {
     pub kind: RegionKind,
 }
 
+#[derive(Debug, Clone)]
 pub enum RegionKind {
     ReEarlyBound(EarlyBoundRegion),
     ReLateBound(DebruijnIndex, BoundRegion),
@@ -51,6 +54,7 @@ pub enum RegionKind {
 
 pub(crate) type DebruijnIndex = u32;
 
+#[derive(Debug, Clone)]
 pub struct EarlyBoundRegion {
     pub def_id: RegionDef,
     pub index: u32,
@@ -59,11 +63,13 @@ pub struct EarlyBoundRegion {
 
 pub(crate) type BoundVar = u32;
 
+#[derive(Debug, Clone)]
 pub struct BoundRegion {
     pub var: BoundVar,
     pub kind: BoundRegionKind,
 }
 
+#[derive(Debug, Clone)]
 pub struct FreeRegion {
     pub scope: RegionDef,
     pub bound_region: BoundRegionKind,
@@ -73,6 +79,7 @@ pub(crate) type RegionVid = u32;
 
 pub(crate) type UniverseIndex = u32;
 
+#[derive(Debug, Clone)]
 pub struct Placeholder<T> {
     pub universe: UniverseIndex,
     pub bound: T,

diff --git a/compiler/rustc_smir/src/stable_mir/visitor.rs b/compiler/rustc_smir/src/stable_mir/visitor.rs
@@ -4,7 +4,7 @@ use crate::rustc_internal::Opaque;
 
 use super::ty::{
     Allocation, Binder, Const, ConstDef, ExistentialPredicate, FnSig, GenericArgKind, GenericArgs,
-    Promoted, RigidTy, TermKind, Ty, UnevaluatedConst,
+    Promoted, Region, RigidTy, TermKind, Ty, UnevaluatedConst,
 };
 
 pub trait Visitor: Sized {
@@ -101,6 +101,12 @@ impl Visitable for GenericArgs {
     }
 }
 
+impl Visitable for Region {
+    fn super_visit<V: Visitor>(&self, _visitor: &mut V) -> ControlFlow<V::Break> {
+        ControlFlow::Continue(())
+    }
+}
+
 impl Visitable for GenericArgKind {
     fn super_visit<V: Visitor>(&self, visitor: &mut V) -> ControlFlow<V::Break> {
         match self {