about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2025-05-07 18:19:08 +0200
committerGitHub <noreply@github.com>2025-05-07 18:19:08 +0200
commit5152ab2f5eb45f3cbb2e9b6df18d379ee0b1d682 (patch)
tree609ab5157d70cc87aaab13661fd2b852b29b509e
parent83e3d0e17b5484d2be639091ce2290e82e33a191 (diff)
parent392880c004836724dfe7600e6f2e0db5f8bad168 (diff)
downloadrust-5152ab2f5eb45f3cbb2e9b6df18d379ee0b1d682.tar.gz
rust-5152ab2f5eb45f3cbb2e9b6df18d379ee0b1d682.zip
Rollup merge of #140734 - ivmarkov:master, r=joboet
Fix regression from #140393 for espidf / horizon / nuttx / vita

#140393 introduced changes to the layout of the `std::sys::process` code.
As a result, the Tier 3 ESP-IDF (and I suspect Horizon, Nuttx and Vita targets as well) no longer build.

A `pub use unsupported::output` is all that was missing - for the above OSes specifically. This explicit `pub use` is now necessary, because #140393 moved the `output` function to module-level, where it was previously part of `Command` and was thus re-exported automatically, as part of the `imp::Command` re-export further down the file containing the one-liner fix.

Note that - with the change introduced by #140393 - we **can't** anymore just do an unconditional `pub use imp::output` as this function simply does not exist anymore anywhere else but in the `unsupported` module.

r? `@joboet`
-rw-r--r--library/std/src/sys/process/unix/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/process/unix/mod.rs b/library/std/src/sys/process/unix/mod.rs
index 2e8b38f7de1..ee8fd8b2ca3 100644
--- a/library/std/src/sys/process/unix/mod.rs
+++ b/library/std/src/sys/process/unix/mod.rs
@@ -11,6 +11,7 @@ cfg_if::cfg_if! {
     } else if #[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "vita", target_os = "nuttx"))] {
         mod unsupported;
         use unsupported as imp;
+        pub use unsupported::output;
     } else {
         mod unix;
         use unix as imp;