Returned from Italy

orchid-api/src/lib.rs

@@ -22,5 +22,3 @@ mod system;
 pub use system::*;
 mod tree;
 pub use tree::*;
-mod vfs;
-pub use vfs::*;

orchid-api/src/proto.rs

@@ -28,7 +28,7 @@ use async_std::io::{Read, Write};
 use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::{Channel, Decode, Encode, MsgSet, Request, read_exact, write_exact};
 
-use crate::{atom, expr, interner, lexer, logging, parser, system, tree, vfs};
+use crate::{atom, expr, interner, lexer, logging, parser, system, tree};
 
 static HOST_INTRO: &[u8] = b"Orchid host, binary API v0\n";
 pub struct HostHeader {
@@ -120,7 +120,6 @@ pub enum HostExtReq {
 	ParseLine(parser::ParseLine),
 	FetchParsedConst(parser::FetchParsedConst),
 	GetMember(tree::GetMember),
-	VfsRead(vfs::VfsRead),
 }
 
 /// Notifications sent from the host to the extension

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, EagerVfs, ExtHostReq, HostExtNotif, HostExtReq, MemberKind, TStr};
+use crate::{CharFilter, ExtHostReq, HostExtNotif, HostExtReq, MemberKind, TStr};
 
 /// ID of a system type
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Coding)]
@@ -63,7 +63,6 @@ pub struct NewSystemResponse {
 	pub lex_filter: CharFilter,
 	pub line_types: Vec<TStr>,
 	pub const_root: HashMap<TStr, MemberKind>,
-	pub vfs: HashMap<TStr, EagerVfs>,
 }
 
 #[derive(Clone, Debug, Coding, Hierarchy)]

orchid-api/src/vfs.rs

@@ -1,32 +0,0 @@
-use std::collections::HashMap;
-use std::num::NonZeroU16;
-
-use orchid_api_derive::{Coding, Hierarchy};
-use orchid_api_traits::Request;
-
-use crate::error::OrcResult;
-use crate::interner::TStr;
-use crate::proto::HostExtReq;
-use crate::system::SysId;
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Coding)]
-pub struct VfsId(pub NonZeroU16);
-
-#[derive(Clone, Debug, Coding)]
-pub enum Loaded {
-	Code(String),
-	Collection(Vec<TStr>),
-}
-
-#[derive(Clone, Debug, Coding, Hierarchy)]
-#[extends(HostExtReq)]
-pub struct VfsRead(pub SysId, pub VfsId, pub Vec<TStr>);
-impl Request for VfsRead {
-	type Response = OrcResult<Loaded>;
-}
-
-#[derive(Clone, Debug, Coding)]
-pub enum EagerVfs {
-	Lazy(VfsId),
-	Eager(HashMap<TStr, EagerVfs>),
-}