Fix compilation: StderrForwarder::set_non_blocking should always be…

… called Signed-off-by: Jiahao XU <[email protected]>
rust-lang · Feb 14, 2024 · 8e5d0bb · 8e5d0bb
1 parent 3d56928
commit 8e5d0bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/command_helpers.rs b/src/command_helpers.rs
@@ -51,7 +51,7 @@ impl CargoOutput {
 
 pub(crate) struct StderrForwarder {
     inner: Option<(ChildStderr, Vec<u8>)>,
-    #[cfg(all(feature = "parallel", unix))]
+    #[cfg(feature = "parallel")]
     is_non_blocking: bool,
     #[cfg(feature = "parallel")]
     bytes_available_failed: bool,
@@ -163,10 +163,11 @@ impl StderrForwarder {
         }
     }
 
-    #[cfg(all(feature = "parallel", unix))]
+    #[cfg(feature = "parallel")]
     pub(crate) fn set_non_blocking(&mut self) -> Result<(), Error> {
         assert!(!self.is_non_blocking);
 
+        #[cfg(unix)]
         if let Some((stderr, _)) = self.inner.as_ref() {
             crate::parallel::stderr::set_non_blocking(stderr)?;
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -1499,7 +1499,6 @@ impl Build {
                 };
                 let mut child = spawn(&mut cmd, &program, &self.cargo_output)?;
                 let mut stderr_forwarder = StderrForwarder::new(&mut child);
-                #[cfg(unix)]
                 stderr_forwarder.set_non_blocking()?;
 
                 cell_update(&pendings, |mut pendings| {