Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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