Temporary commit to try fix halting

orchid-api/src/atom.rs

@@ -5,7 +5,7 @@ use orchid_api_traits::Request;
 
 use crate::{
 	ExprTicket, Expression, ExtHostReq, FormattingUnit, HostExtNotif, HostExtReq, OrcResult, SysId,
-	TStrv,
+	TVec,
 };
 
 pub type AtomData = Vec<u8>;
@@ -83,14 +83,14 @@ impl Request for DeserAtom {
 /// A request blindly routed to the system that provides an atom.
 #[derive(Clone, Debug, Hash, PartialEq, Eq, Coding, Hierarchy)]
 #[extends(AtomReq, HostExtReq)]
-pub struct Fwded(pub Atom, pub TStrv, pub Vec<u8>);
+pub struct Fwded(pub Atom, pub TVec, pub Vec<u8>);
 impl Request for Fwded {
 	type Response = Option<Vec<u8>>;
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq, Coding, Hierarchy)]
 #[extends(ExtHostReq)]
-pub struct Fwd(pub Atom, pub TStrv, pub Vec<u8>);
+pub struct Fwd(pub Atom, pub TVec, pub Vec<u8>);
 impl Request for Fwd {
 	type Response = Option<Vec<u8>>;
 }

orchid-api/src/expr.rs

@@ -3,7 +3,7 @@ use std::num::NonZeroU64;
 use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 
-use crate::{Atom, ExtHostNotif, ExtHostReq, Location, OrcError, SysId, TStrv};
+use crate::{Atom, ExtHostNotif, ExtHostReq, Location, OrcError, SysId, TVec};
 
 /// An arbitrary ID associated with an expression on the host side. Incoming
 /// tickets always come with some lifetime guarantee, which can be extended with
@@ -72,7 +72,7 @@ pub enum ExpressionKind {
 	/// Because the atom is newly constructed, it also must belong to this system.
 	NewAtom(Atom),
 	/// A reference to a constant
-	Const(TStrv),
+	Const(TVec),
 	/// A static runtime error.
 	Bottom(Vec<OrcError>),
 }

orchid-api/src/interner.rs

@@ -47,7 +47,7 @@ impl Request for ExternStr {
 #[extends(IntReq, ExtHostReq)]
 pub struct InternStrv(pub Vec<TStr>);
 impl Request for InternStrv {
-	type Response = TStrv;
+	type Response = TVec;
 }
 /// replica -> master to find the vector of interned strings corresponding to a
 /// token
@@ -57,7 +57,7 @@ impl Request for InternStrv {
 /// See [IntReq]
 #[derive(Clone, Debug, Coding, Hierarchy)]
 #[extends(IntReq, ExtHostReq)]
-pub struct ExternStrv(pub TStrv);
+pub struct ExternStrv(pub TVec);
 impl Request for ExternStrv {
 	type Response = Vec<TStr>;
 }
@@ -68,7 +68,7 @@ pub struct TStr(pub NonZeroU64);
 
 /// A substitute for an interned string sequence in serialized datastructures.
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Coding)]
-pub struct TStrv(pub NonZeroU64);
+pub struct TVec(pub NonZeroU64);
 
 /// A request to sweep the replica. The master will not be sweeped until all
 /// replicas respond, as it must retain everything the replicas retained
@@ -84,5 +84,5 @@ impl Request for Sweep {
 #[derive(Clone, Debug, Coding)]
 pub struct Retained {
 	pub strings: Vec<TStr>,
-	pub vecs: Vec<TStrv>,
+	pub vecs: Vec<TVec>,
 }

orchid-api/src/lexer.rs

@@ -3,7 +3,7 @@ use std::ops::RangeInclusive;
 use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 
-use crate::{ExtHostReq, HostExtReq, OrcResult, ParsId, SysId, TStr, TStrv, TokenTree};
+use crate::{ExtHostReq, HostExtReq, OrcResult, ParsId, SysId, TStr, TVec, TokenTree};
 
 /// - All ranges contain at least one character
 /// - All ranges are in increasing characeter order
@@ -19,7 +19,7 @@ pub struct LexExpr {
 	pub text: TStr,
 	pub pos: u32,
 	/// Source root module path
-	pub src: TStrv,
+	pub src: TVec,
 }
 impl Request for LexExpr {
 	type Response = Option<OrcResult<LexedExpr>>;

orchid-api/src/location.rs

@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use orchid_api_derive::Coding;
 
-use crate::{TStr, TStrv};
+use crate::{TStr, TVec};
 
 #[derive(Clone, Debug, Coding)]
 pub enum Location {
@@ -21,12 +21,12 @@ pub enum Location {
 
 #[derive(Clone, Debug, Coding)]
 pub struct SourceRange {
-	pub path: TStrv,
+	pub path: TVec,
 	pub range: Range<u32>,
 }
 
 #[derive(Clone, Debug, Coding)]
 pub struct CodeGenInfo {
-	pub generator: TStrv,
+	pub generator: TVec,
 	pub details: TStr,
 }

orchid-api/src/parser.rs

@@ -5,7 +5,7 @@ use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 
 use crate::{
-	Expression, ExtHostReq, HostExtReq, OrcResult, SourceRange, SysId, TStr, TStrv, TokenTree,
+	Expression, ExtHostReq, HostExtReq, OrcResult, SourceRange, SysId, TStr, TVec, TokenTree,
 };
 
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Coding)]
@@ -24,10 +24,10 @@ pub struct ParsedConstId(pub NonZeroU64);
 pub struct ParseLine {
 	pub sys: SysId,
 	/// The immediately enclosing module path
-	pub module: TStrv,
+	pub module: TVec,
 	/// The root module path for the snipppet of source code, prefix of
 	/// [ParseLine#module]
-	pub src: TStrv,
+	pub src: TVec,
 	pub comments: Vec<Comment>,
 	pub exported: bool,
 	pub idx: u16,
@@ -97,9 +97,9 @@ pub struct Comment {
 pub struct ResolveNames {
 	pub sys: SysId,
 	pub constid: ParsedConstId,
-	pub names: Vec<TStrv>,
+	pub names: Vec<TVec>,
 }
 
 impl Request for ResolveNames {
-	type Response = Vec<OrcResult<TStrv>>;
+	type Response = Vec<OrcResult<TVec>>;
 }

orchid-api/src/system.rs

@@ -5,7 +5,7 @@ use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 use ordered_float::NotNan;
 
-use crate::{CharFilter, ExtHostReq, HostExtNotif, HostExtReq, MemberKind, TStr, TStrv};
+use crate::{CharFilter, ExtHostReq, HostExtNotif, HostExtReq, MemberKind, TStr, TVec};
 
 /// ID of a system type
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Coding)]
@@ -63,7 +63,7 @@ pub struct NewSystemResponse {
 	pub lex_filter: CharFilter,
 	pub line_types: Vec<TStr>,
 	pub const_root: HashMap<TStr, MemberKind>,
-	pub prelude: Vec<TStrv>,
+	pub prelude: Vec<TVec>,
 }
 
 #[derive(Clone, Debug, Coding, Hierarchy)]

orchid-api/src/tree.rs

@@ -6,7 +6,7 @@ use std::rc::Rc;
 use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 
-use crate::{ExprTicket, Expression, ExtHostReq, HostExtReq, OrcError, SysId, TStr, TStrv};
+use crate::{ExprTicket, Expression, ExtHostReq, HostExtReq, OrcError, SysId, TStr, TVec};
 
 /// A token tree from a lexer recursion request. Its lifetime is the lex call,
 /// the lexer can include it in its output or discard it by implication.
@@ -92,7 +92,7 @@ impl Request for GetMember {
 /// an atom call.
 #[derive(Clone, Copy, Debug, Coding, Hierarchy)]
 #[extends(ExtHostReq)]
-pub struct LsModule(pub SysId, pub TStrv);
+pub struct LsModule(pub SysId, pub TVec);
 impl Request for LsModule {
 	type Response = Result<ModuleInfo, LsModuleError>;
 }