build(deps): Get rid of 'yoke' dependency

Author: fogti

Cargo.lock

@@ -67,7 +67,6 @@ virtio-bindings = "~0.2.7"
 vm-fdt = "0.3"
 vm-memory = { version = "0.18", features = ["backend-mmap"] }
 uuid = { version = "1.21.0", features = ["fast-rng", "v4"]}
-yoke = "0.8"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 kvm-bindings = "0.14"

Cargo.toml

@@ -412,7 +412,6 @@ fn read(mem: &MmapMemory, sysread: &mut v2::parameters::ReadParams, file_map: &m
 					}
 				}
 				FdData::Virtual { data, offset } => {
-					let data: &[u8] = data.get();
 					let remaining = {
 						let pos = cmp::min(*offset, data.len() as u64);
 						&data[pos as usize..]
@@ -573,7 +572,7 @@ fn lseek(syslseek: &mut LseekParams, file_map: &mut UhyveFileMap) {
 			let tmp: i64 = match syslseek.whence as i32 {
 				SEEK_SET => 0,
 				SEEK_CUR => *offset as i64,
-				SEEK_END => data.get().len() as i64,
+				SEEK_END => data.len() as i64,
 				_ => -EINVAL as i64,
 			};
 			if tmp >= 0 {

src/hypercall.rs

@@ -3,10 +3,10 @@ use std::{
 	fmt,
 	hash::BuildHasherDefault,
 	os::fd::{FromRawFd, OwnedFd, RawFd},
+	sync::Arc,
 };
 
 use nohash::NoHashHasher;
-use yoke::{Yoke, erased::ErasedArcCart};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct GuestFd(pub i32);
@@ -51,18 +51,14 @@ pub enum FdData {
 	/// An in-memory slice (possibly mmap-ed)
 	///
 	/// SAFETY: It is not allowed for `data` to point into guest memory.
-	Virtual {
-		data: Yoke<&'static [u8], ErasedArcCart>,
-		offset: u64,
-	},
+	Virtual { data: Arc<[u8]>, offset: u64 },
 }
 
 impl fmt::Debug for FdData {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		match self {
 			FdData::Raw(r) => write!(f, "Raw({r})"),
 			FdData::Virtual { data, offset } => {
-				let data = data.get();
 				let data_snip = &data[..core::cmp::min(10, data.len())];
 				write!(f, "Virtual({data_snip:?} @ {offset})")
 			}