Method refactor now compiles

orchid-host/src/dylib.rs

@@ -2,9 +2,13 @@ use std::io;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
+use futures::io::BufReader;
+use futures::{AsyncBufReadExt, StreamExt};
 use hashbrown::HashMap;
-use libloading::Library;
+use libloading::{Library, Symbol};
 use orchid_base::binary::vt_to_future;
+use orchid_base::logging::log;
+use unsync_pipe::pipe;
 
 use crate::api;
 use crate::ctx::Ctx;
@@ -23,23 +27,16 @@ fn load_dylib(path: &Path) -> Result<Arc<Library>, libloading::Error> {
 	}
 }
 
-#[cfg(feature = "tokio")]
 pub async fn ext_dylib(path: &Path, ctx: Ctx) -> Result<ExtPort, libloading::Error> {
-	use futures::io::BufReader;
-	use futures::{AsyncBufReadExt, StreamExt};
-	use libloading::Symbol;
-	use unsync_pipe::pipe;
-
 	let (write_input, input) = pipe(1024);
 	let (output, read_output) = pipe(1024);
-	let (log, read_log) = pipe(1024);
+	let (write_log, read_log) = pipe(1024);
 	let log_path = path.to_string_lossy().to_string();
 	let _ = ctx.spawn(async move {
-		use orchid_base::logging::log;
 		let mut lines = BufReader::new(read_log).lines();
 		while let Some(line) = lines.next().await {
 			match line {
-				Ok(line) => writeln!(log("stderr"), "{log_path} err> {line}").await,
+				Ok(line) => writeln!(log("stderr"), "dylib {log_path} err> {line}").await,
 				Err(e) => match e.kind() {
 					io::ErrorKind::BrokenPipe | io::ErrorKind::UnexpectedEof => break,
 					_ => panic!("Error while reading stderr {e}"),
@@ -56,7 +53,7 @@ pub async fn ext_dylib(path: &Path, ctx: Ctx) -> Result<ExtPort, libloading::Err
 		let _ = unsafe { (data as *mut Ctx).as_mut().unwrap().spawn(vt_to_future(vt)) };
 	}
 	let spawner = api::binary::SpawnerBin { data, drop, spawn };
-	let cx = api::binary::ExtensionContext { input, output, log, spawner };
+	let cx = api::binary::ExtensionContext { input, output, log: write_log, spawner };
 	unsafe { (entrypoint)(cx) };
 	Ok(ExtPort { input: Box::pin(write_input), output: Box::pin(read_output) })
 }