Skip to content

Commit 5152ab2

Browse files
Rollup merge of rust-lang#140734 - ivmarkov:master, r=joboet
Fix regression from rust-lang#140393 for espidf / horizon / nuttx / vita rust-lang#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 rust-lang#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 rust-lang#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`
2 parents 83e3d0e + 392880c commit 5152ab2

File tree

1 file changed

+1
-0
lines changed
  • library/std/src/sys/process/unix

1 file changed

+1
-0
lines changed

library/std/src/sys/process/unix/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cfg_if::cfg_if! {
1111
} else if #[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "vita", target_os = "nuttx"))] {
1212
mod unsupported;
1313
use unsupported as imp;
14+
pub use unsupported::output;
1415
} else {
1516
mod unix;
1617
use unix as imp;

0 commit comments

Comments
 (0)