fixed no_std once more

Author: domenukk

libafl/src/bolts/os/pipes.rs

@@ -1,8 +1,17 @@
 //! Unix `pipe` wrapper for `LibAFL`
 use crate::Error;
-use nix::unistd::{close, pipe, read, write};
-use std::io::{self, ErrorKind, Read, Write};
-use std::os::unix::io::RawFd;
+use nix::unistd::{close, pipe};
+
+#[cfg(feature = "std")]
+use nix::unistd::{read, write};
+#[cfg(feature = "std")]
+use std::{
+    io::{self, ErrorKind, Read, Write},
+    os::unix::io::RawFd,
+};
+
+#[cfg(not(feature = "std"))]
+type RawFd = i32;
 
 #[derive(Debug, Clone)]
 pub struct Pipe {
@@ -34,6 +43,7 @@ impl Pipe {
     }
 }
 
+#[cfg(feature = "std")]
 impl Read for Pipe {
     /// Reads a few bytes
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, io::Error> {
@@ -50,6 +60,7 @@ impl Read for Pipe {
     }
 }
 
+#[cfg(feature = "std")]
 impl Write for Pipe {
     /// Writes a few bytes
     fn write(&mut self, buf: &[u8]) -> Result<usize, io::Error> {

libafl/src/bolts/shmem.rs

@@ -17,6 +17,8 @@ pub type OsShMemProvider = Win32ShMemProvider;
 #[cfg(all(windows, feature = "std"))]
 pub type OsShMem = Win32ShMem;
 
+use crate::Error;
+
 #[cfg(all(target_os = "android", feature = "std"))]
 use crate::bolts::os::ashmem_server::ServedShMemProvider;
 #[cfg(all(target_os = "android", feature = "std"))]
@@ -39,7 +41,7 @@ use alloc::{rc::Rc, string::ToString};
 use core::{cell::RefCell, fmt::Debug, mem::ManuallyDrop};
 
 #[cfg(all(unix, feature = "std"))]
-use crate::{bolts::os::pipes::Pipe, Error};
+use crate::bolts::os::pipes::Pipe;
 #[cfg(all(unix, feature = "std"))]
 use std::io::{Read, Write};
 
@@ -252,7 +254,7 @@ impl<T: ShMemProvider> Drop for RcShMem<T> {
 /// that can use internal mutability.
 /// Useful if the `ShMemProvider` needs to keep local state.
 #[derive(Debug, Clone)]
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 pub struct RcShMemProvider<T: ShMemProvider> {
     /// The wrapped [`ShMemProvider`].
     internal: Rc<RefCell<T>>,
@@ -266,10 +268,10 @@ pub struct RcShMemProvider<T: ShMemProvider> {
     parent_child_pipe: Option<Pipe>,
 }
 
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 unsafe impl<T: ShMemProvider> Send for RcShMemProvider<T> {}
 
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 impl<T> ShMemProvider for RcShMemProvider<T>
 where
     T: ShMemProvider + alloc::fmt::Debug,
@@ -339,7 +341,7 @@ where
     }
 }
 
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 impl<T> RcShMemProvider<T>
 where
     T: ShMemProvider,
@@ -402,7 +404,7 @@ where
     }
 }
 
-#[cfg(unix)]
+#[cfg(all(unix, feature = "std"))]
 impl<T> Default for RcShMemProvider<T>
 where
     T: ShMemProvider + alloc::fmt::Debug,

libafl/src/utils.rs

@@ -1,12 +1,14 @@
 //! Utility functions for AFL
 
+use crate::Error;
+
+#[cfg(feature = "std")]
 use crate::{
     bolts::shmem::ShMemProvider,
     events::llmp::{LlmpRestartingEventManager, ManagerKind},
     inputs::Input,
     state::IfInteresting,
     stats::Stats,
-    Error,
 };
 
 use alloc::vec::Vec;