Skip to content

Commit

Permalink
Rollup merge of rust-lang#23079 - alexcrichton:deprecate-process, r=a…
Browse files Browse the repository at this point in the history
…turon

 This module is now superseded by the `std::process` module. This module still
has some room to expand to get quite back up to parity with the `old_io`
version, and there is a [tracking issue][issue] for feature requests as well as
known room for expansion.

[issue]: rust-lang/rfcs#941
[breaking-change]
  • Loading branch information
Manishearth committed Mar 6, 2015
2 parents d77fc9f + 7ed418c commit c9063e0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/librustc_back/target/apple_ios_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use std::old_io::{Command, IoError, OtherIoError};
use std::io;
use std::process::Command;
use target::TargetOptions;

use self::Arch::*;
Expand Down Expand Up @@ -40,16 +41,15 @@ pub fn get_sdk_root(sdk_name: &str) -> String {
.arg("--show-sdk-path")
.arg("-sdk")
.arg(sdk_name)
.spawn()
.and_then(|c| c.wait_with_output())
.output()
.and_then(|output| {
if output.status.success() {
Ok(String::from_utf8(output.output).unwrap())
Ok(String::from_utf8(output.stdout).unwrap())
} else {
Err(IoError {
kind: OtherIoError,
desc: "process exit with error",
detail: String::from_utf8(output.error).ok()})
let error = String::from_utf8(output.stderr);
Err(io::Error::new(io::ErrorKind::Other,
"process exit with error",
error.ok()))
}
});

Expand Down
3 changes: 3 additions & 0 deletions src/libstd/old_io/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
//! Bindings for executing child processes
#![allow(non_upper_case_globals)]
#![unstable(feature = "old_io")]
#![deprecated(since = "1.0.0",
reason = "replaced with the std::process module")]

pub use self::StdioContainer::*;
pub use self::ProcessExit::*;
Expand Down
2 changes: 2 additions & 0 deletions src/libstd/sys/unix/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![allow(deprecated)]

use prelude::v1::*;
use self::Req::*;

Expand Down
2 changes: 2 additions & 0 deletions src/libstd/sys/windows/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![allow(deprecated)]

use prelude::v1::*;

use collections;
Expand Down

0 comments on commit c9063e0

Please sign in to comment.