run-make: drop os_pipe
workaround now that anonymous_pipe
is stable on beta
This commit is contained in:
parent
94015d3cd4
commit
83af9f57c1
4 changed files with 2 additions and 21 deletions
11
Cargo.lock
11
Cargo.lock
|
@ -2572,16 +2572,6 @@ version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "os_pipe"
|
|
||||||
version = "1.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"windows-sys 0.59.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "overload"
|
name = "overload"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
|
@ -3142,7 +3132,6 @@ dependencies = [
|
||||||
"gimli 0.31.1",
|
"gimli 0.31.1",
|
||||||
"libc",
|
"libc",
|
||||||
"object 0.36.7",
|
"object 0.36.7",
|
||||||
"os_pipe",
|
|
||||||
"regex",
|
"regex",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"similar",
|
"similar",
|
||||||
|
|
|
@ -14,9 +14,5 @@ build_helper = { path = "../../build_helper" }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
|
|
||||||
# FIXME(#137532): replace `os_pipe` with `anonymous_pipe` once it stabilizes and
|
|
||||||
# reaches beta.
|
|
||||||
os_pipe = "1.2.1"
|
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
crate-type = ["lib", "dylib"]
|
crate-type = ["lib", "dylib"]
|
||||||
|
|
|
@ -41,8 +41,6 @@ pub use bstr;
|
||||||
pub use gimli;
|
pub use gimli;
|
||||||
pub use libc;
|
pub use libc;
|
||||||
pub use object;
|
pub use object;
|
||||||
// FIXME(#137532): replace with std `anonymous_pipe` once it stabilizes and reaches beta.
|
|
||||||
pub use os_pipe;
|
|
||||||
pub use regex;
|
pub use regex;
|
||||||
pub use serde_json;
|
pub use serde_json;
|
||||||
pub use similar;
|
pub use similar;
|
||||||
|
|
|
@ -14,9 +14,7 @@
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
// FIXME(#137532): replace `os_pipe` dependency with std `anonymous_pipe` once that stabilizes and
|
use run_make_support::env_var;
|
||||||
// reaches beta.
|
|
||||||
use run_make_support::{env_var, os_pipe};
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
enum Binary {
|
enum Binary {
|
||||||
|
@ -25,7 +23,7 @@ enum Binary {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_broken_pipe_handled_gracefully(bin: Binary, mut cmd: Command) {
|
fn check_broken_pipe_handled_gracefully(bin: Binary, mut cmd: Command) {
|
||||||
let (reader, writer) = os_pipe::pipe().unwrap();
|
let (reader, writer) = std::io::pipe().unwrap();
|
||||||
drop(reader); // close read-end
|
drop(reader); // close read-end
|
||||||
cmd.stdout(writer).stderr(Stdio::piped());
|
cmd.stdout(writer).stderr(Stdio::piped());
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue