Unit tests pass

Fixed a nasty deadlock in reqnot
This commit is contained in:
2026-01-19 00:56:03 +01:00
parent 6a3c1d5917
commit 48942b3b2c
15 changed files with 223 additions and 85 deletions

View File

@@ -4,7 +4,6 @@ use async_fn_stream::stream;
use futures::future::join_all;
use futures::{Stream, StreamExt, stream};
use never::Never;
use orchid_api::ExprTicket;
use orchid_api_derive::Coding;
use orchid_base::error::{OrcRes, mk_errv};
use orchid_base::format::fmt;
@@ -28,7 +27,7 @@ use crate::{HomoTpl, MacTok, MacTree, OrcOpt, Tpl, UntypedTuple, api};
#[derive(Clone, Coding)]
pub struct MatcherData {
keys: Vec<api::TStrv>,
matcher: ExprTicket,
matcher: api::ExprTicket,
}
impl MatcherData {
async fn matcher(&self) -> Expr { Expr::from_handle(ExprHandle::from_ticket(self.matcher).await) }

View File

@@ -1,6 +1,5 @@
use std::borrow::Cow;
use orchid_api::TStrv;
use orchid_api_derive::{Coding, Hierarchy};
use orchid_api_traits::Request;
use orchid_base::error::mk_errv;
@@ -37,7 +36,7 @@ impl Supports<ToStringMethod> for SymAtom {
#[derive(Clone, Debug, Coding, Hierarchy)]
#[extends(StdReq)]
pub struct CreateSymAtom(pub TStrv);
pub struct CreateSymAtom(pub api::TStrv);
impl Request for CreateSymAtom {
type Response = api::ExprTicket;
}

View File

@@ -6,7 +6,6 @@ use std::rc::Rc;
use futures::AsyncWrite;
use futures::future::join_all;
use never::Never;
use orchid_api::ExprTicket;
use orchid_api_derive::{Coding, Hierarchy};
use orchid_api_traits::Request;
use orchid_base::error::{OrcRes, mk_errv};
@@ -27,7 +26,7 @@ use crate::{Int, StdSystem, api};
pub struct Tuple(pub(super) Rc<Vec<Expr>>);
impl Atomic for Tuple {
type Data = Vec<ExprTicket>;
type Data = Vec<api::ExprTicket>;
type Variant = OwnedVariant;
}