Rename ScopeExt

metaborg · Jun 13, 2024 · 632a822 · 632a822
1 parent 01e8786
commit 632a822
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/scopegraphs/examples/records/main.rs b/scopegraphs/examples/records/main.rs
@@ -2,7 +2,7 @@ use crate::ast::{Expr, Program, RecordDef, Type};
 use crate::queries::{resolve_lexical_ref, resolve_member_ref, resolve_record_ref};
 use async_recursion::async_recursion;
 use futures::future::join;
-use scopegraphs::completeness::{FutureCompleteness, ScopeExt};
+use scopegraphs::completeness::{FutureCompleteness, ScopeExtPerm};
 use scopegraphs::render::{RenderScopeData, RenderScopeLabel, RenderSettings};
 use scopegraphs::{add_scope, Scope, ScopeGraph, Storage};
 use scopegraphs_macros::Label;
@@ -95,7 +95,7 @@ enum PartialType {
 }
 
 type RecordScopegraph<'sg> = ScopeGraph<'sg, SgLabel, SgData, FutureCompleteness<SgLabel>>;
-type SgScopeExt<'sg> = ScopeExt<'sg, SgLabel, SgData, FutureCompleteness<SgLabel>>;
+type SgScopeExt<'sg> = ScopeExtPerm<'sg, SgLabel, SgData, FutureCompleteness<SgLabel>>;
 
 struct TypeChecker<'sg, 'ex> {
     sg: &'sg RecordScopegraph<'sg>,

diff --git a/scopegraphs/src/completeness/mod.rs b/scopegraphs/src/completeness/mod.rs
@@ -125,7 +125,7 @@ pub trait Implicit<LABEL: Label, DATA>: Completeness<LABEL, DATA> {}
 /// Represents the permission to extend a scope with a particular label.
 ///
 /// Do not instantiate this struct manually, but use the [add_scope] macro instead.
-pub struct ScopeExt<
+pub struct ScopeExtPerm<
     'ext,
     LABEL: Hash + Label + Debug, /* <= Bound here required for Drop implementation */
     DATA,
@@ -140,7 +140,7 @@ pub struct ScopeExt<
     _data: PhantomData<DATA>, // FIXME: required for using `where CMPL: UserClosed<LABEL, DATA>` in impl blocks. Can it be removed some way?
 }
 
-impl<'ext, LABEL: Hash + Label + Debug, DATA, CMPL> Drop for ScopeExt<'ext, LABEL, DATA, CMPL>
+impl<'ext, LABEL: Hash + Label + Debug, DATA, CMPL> Drop for ScopeExtPerm<'ext, LABEL, DATA, CMPL>
 where
     CMPL: UserClosed<LABEL, DATA>,
 {
@@ -152,7 +152,7 @@ where
 }
 
 impl<'ext, LABEL: Hash + Label + Debug, DATA, CMPL: UserClosed<LABEL, DATA>>
-    ScopeExt<'ext, LABEL, DATA, CMPL>
+    ScopeExtPerm<'ext, LABEL, DATA, CMPL>
 where
     CMPL: UserClosed<LABEL, DATA>,
 {
@@ -162,8 +162,8 @@ where
         scope: Scope,
         label: LABEL,
         sg: &'ext ScopeGraph<'storage, LABEL, DATA, CMPL>,
-    ) -> ScopeExt<'ext, LABEL, DATA, CMPL> {
-        ScopeExt {
+    ) -> ScopeExtPerm<'ext, LABEL, DATA, CMPL> {
+        ScopeExtPerm {
             scope,
             label,
             sg: &sg.completeness,
@@ -279,7 +279,7 @@ macro_rules! add_scope {
         let scope = sg.add_scope_with(data, [$($lbl),*]);
 
         // return the scope, and the extension permissions
-        (scope, $(unsafe { $crate::completeness::ScopeExt::init(scope, $lbl, sg) }),*)
+        (scope, $(unsafe { $crate::completeness::ScopeExtPerm::init(scope, $lbl, sg) }),*)
     }
   };
 

diff --git a/scopegraphs/src/scopegraph.rs b/scopegraphs/src/scopegraph.rs
@@ -5,7 +5,7 @@ use std::{
     hash::Hash,
 };
 
-use crate::completeness::{Completeness, Implicit, ScopeExt, UncheckedCompleteness, UserClosed};
+use crate::completeness::{Completeness, Implicit, ScopeExtPerm, UncheckedCompleteness, UserClosed};
 use crate::label::ArrayInit;
 use crate::storage::Storage;
 use crate::Label;
@@ -228,7 +228,7 @@ where
     /// Permission for this is checked by `CMPL`.
     pub fn ext_edge<'ext>(
         &'ext self,
-        ext: &ScopeExt<'ext, LABEL, DATA, CMPL>,
+        ext: &ScopeExtPerm<'ext, LABEL, DATA, CMPL>,
         dst: Scope,
     ) -> CMPL::NewEdgeResult {
         self.completeness
@@ -247,7 +247,7 @@ where
     /// ```
     pub fn ext_decl<'ext>(
         &'ext self,
-        ext: &ScopeExt<'ext, LABEL, DATA, CMPL>,
+        ext: &ScopeExtPerm<'ext, LABEL, DATA, CMPL>,
         data: DATA,
     ) -> CMPL::NewEdgeResult {
         // Create scope with no open edges.