WIP error bounds

metaborg · Oct 30, 2024 · 08b8b38 · 08b8b38
1 parent 558c44b
commit 08b8b38
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/scopegraphs/src/containers/env.rs b/scopegraphs/src/containers/env.rs
@@ -134,7 +134,7 @@ where
     }
 }
 
-impl<'sg: 'rslv, 'rslv, LABEL: 'sg + Eq, DATA: 'sg + Eq, E: 'rslv>
+/* impl<'sg: 'rslv, 'rslv, LABEL: 'sg + Eq, DATA: 'sg + Eq, E: 'rslv>
     Injectable<'sg, 'rslv, LABEL, DATA, Result<bool, E>> for Result<Env<'sg, LABEL, DATA>, E>
 where
     ResolvedPath<'sg, LABEL, DATA>: Hash + Clone,
@@ -143,7 +143,7 @@ where
     fn inject_if(data_ok: Result<bool, E>, path: ResolvedPath<'sg, LABEL, DATA>) -> Self {
         data_ok.map(|ok| if ok { Env::single(path) } else { Env::empty() })
     }
-}
+} */
 
 impl<'sg: 'rslv, 'rslv, LABEL: 'sg + Eq, DATA: 'sg + Eq, RE, UE>
     Injectable<'sg, 'rslv, LABEL, DATA, Result<bool, RE>>

diff --git a/scopegraphs/src/containers/mod.rs b/scopegraphs/src/containers/mod.rs
@@ -4,6 +4,7 @@
 //! by [`Completeness`](crate::completeness::Completeness) implementations.
 
 /// Union of errors during resolution (i.e., delays) and error during predicate evaluation.
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum ResolveOrUserError<RE, UE> {
     /// Resolution error.
     Resolve(RE),

diff --git a/scopegraphs/src/containers/scope.rs b/scopegraphs/src/containers/scope.rs
@@ -26,7 +26,7 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
 /// - [Result] of scope containers, and
 /// - [FutureWrapper] of scope containers.
 /// ```
-/// # use scopegraphs::containers::ScopeContainerWf;
+/// # use scopegraphs::containers::{ResolveOrUserError,ScopeContainerWf};
 /// # use scopegraphs::future_wrapper::FutureWrapper;
 /// # use scopegraphs::Scope;
 /// # use std::fmt::Debug;
@@ -44,10 +44,11 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
 ///     test::<'_, '_, LABEL, DATA, bool>(vec);
 /// # }
 ///
-/// # fn result<'sg, 'rslv, LABEL: LBound<'sg>, DATA: DBound<'sg>, E: Debug + Clone>() {
-///     let result: Result<Vec<Scope>, E> = todo!();
+/// # fn result<'sg, 'rslv, LABEL: LBound<'sg>, DATA: DBound<'sg>, RE: Debug + Clone + 'rslv, UE: Debug + Clone + 'rslv>() {
+///     let result: Result<Vec<Scope>, RE> = todo!();
 ///     test::<'_, '_, LABEL, DATA, bool>(result);
-///     test::<'_, '_, LABEL, DATA, Result<bool, E>>(result);
+///     let result_or_err: Result<Vec<Scope>, ResolveOrUserError<RE, UE>> = todo!();
+///     test::<'_, '_, LABEL, DATA, Result<bool, UE>>(result_or_err);
 /// # }
 ///
 /// # fn future<'sg, 'rslv, LABEL: LBound<'sg>, DATA: DBound<'sg>>() {
@@ -70,13 +71,13 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
 /// ```
 ///
 /// ```no_run
-/// # use scopegraphs::containers::ScopeContainerWf;
+/// # use scopegraphs::containers::{ResolveOrUserError, ScopeContainerWf};
 /// # use scopegraphs::Scope;
 /// # use std::fmt::Debug;
 /// # use std::hash::Hash;
 ///
 /// test::<'_, '_, (), (), bool>(Result::<_, ()>::Ok(Vec::<Scope>::new()));
-/// test::<'_, '_, (), (), Result<bool, ()>>(Result::<_, ()>::Ok(Vec::<Scope>::new()));
+/// test::<'_, '_, (), (), Result<bool, ()>>(Result::<_, ResolveOrUserError<(), ()>>::Ok(Vec::<Scope>::new()));
 ///
 /// fn test<'sg, 'rslv, LABEL: Clone + Hash + Eq + Debug + 'sg, DATA: Hash + Eq + 'sg, DWFO>(
 ///     cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO, DWFO>

diff --git a/scopegraphs/src/resolve/lookup.rs b/scopegraphs/src/resolve/lookup.rs
@@ -342,18 +342,14 @@ where
 #[cfg(test)]
 mod tests {
 
+    use std::convert::Infallible;
+
     use scopegraphs_macros::label_order;
 
     use crate::{
-        add_scope,
-        completeness::{
+        add_scope, completeness::{
             Delay, ExplicitClose, FutureCompleteness, ImplicitClose, UncheckedCompleteness,
-        },
-        future_wrapper::FutureWrapper,
-        query_regex,
-        resolve::{Resolve, ResolvedPath},
-        storage::Storage,
-        Label, ScopeGraph,
+        }, containers::ResolveOrUserError, future_wrapper::FutureWrapper, query_regex, resolve::{Resolve, ResolvedPath}, storage::Storage, Label, ScopeGraph
     };
 
     #[derive(Label, Hash, PartialEq, Eq, Debug, Clone, Copy)]
@@ -392,7 +388,7 @@ mod tests {
             |data: &Self| data.matches(n)
         }
 
-        fn matcher_res(n: &'a str) -> impl (for<'b> Fn(&'b Self) -> Result<bool, Delay<Lbl>>) {
+        fn matcher_res(n: &'a str) -> impl (for<'b> Fn(&'b Self) -> Result<bool, Infallible>) {
             |data: &Self| Ok(data.matches(n))
         }
 
@@ -658,7 +654,7 @@ mod tests {
         // todo!("assert the correct edges are closed!")
     }
 
-    #[test]
+    /* #[test]
     fn test_label_order_complex_explicit_close() {
         let storage = Storage::new();
         let scope_graph: ScopeGraph<Lbl, TData, ExplicitClose<Lbl>> =
@@ -692,7 +688,7 @@ mod tests {
         let_lex.close();
         let_def.close();
 
-        let env = scope_graph
+        let env: Result<_, ResolveOrUserError<_, Infallible>> = scope_graph
             .query()
             .with_path_wellformedness(query_regex!(Lbl: Lex* Imp? Def))
             .with_data_wellformedness(TData::matcher_res("x"))
@@ -707,7 +703,7 @@ mod tests {
         assert!(matches!(path.data(), &Data { name: "x", data: 2 }));
 
         // todo!("assert the correct edges are closed!")
-    }
+    }*/
 
     #[test]
     fn test_caching() {