diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-14 16:42:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-14 16:42:32 +0200 |
| commit | f669872690ff403e36fe7ae28d53ea3eb9032b79 (patch) | |
| tree | 07796f3c6e8a87f04b0815d1a13dffffd7ac8467 /src/libstd | |
| parent | f7dd5d0f2092d50bad6ea649e86ceccbdeb8b7e7 (diff) | |
| parent | 08fa8039468c81df80a275a479f197d397bf72dc (diff) | |
| download | rust-f669872690ff403e36fe7ae28d53ea3eb9032b79.tar.gz rust-f669872690ff403e36fe7ae28d53ea3eb9032b79.zip | |
Rollup merge of #64393 - Wind-River:master_002_envKey, r=alexcrichton
declare EnvKey before use to fix build error r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/vxworks/process/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/process/process_common.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/sys/vxworks/process/mod.rs b/src/libstd/sys/vxworks/process/mod.rs index 4dc706006f4..1fc88fbde74 100644 --- a/src/libstd/sys/vxworks/process/mod.rs +++ b/src/libstd/sys/vxworks/process/mod.rs @@ -1,5 +1,6 @@ pub use self::process_common::{Command, ExitStatus, ExitCode, Stdio, StdioPipes}; pub use self::process_inner::Process; +pub use crate::ffi::OsString as EnvKey; mod process_common; #[path = "process_vxworks.rs"] diff --git a/src/libstd/sys/vxworks/process/process_common.rs b/src/libstd/sys/vxworks/process/process_common.rs index 509140229fd..13648abd1e4 100644 --- a/src/libstd/sys/vxworks/process/process_common.rs +++ b/src/libstd/sys/vxworks/process/process_common.rs @@ -12,8 +12,6 @@ use crate::collections::BTreeMap; use libc::{c_int, gid_t, uid_t, c_char, EXIT_SUCCESS, EXIT_FAILURE}; -pub use crate::ffi::OsString as EnvKey; - //////////////////////////////////////////////////////////////////////////////// // Command //////////////////////////////////////////////////////////////////////////////// |