Skip to content

Commit 83af9f5

Browse files
committed
run-make: drop os_pipe workaround now that anonymous_pipe is stable on beta
1 parent 94015d3 commit 83af9f5

File tree

4 files changed

+2
-21
lines changed

4 files changed

+2
-21
lines changed

Cargo.lock

-11
Original file line numberDiff line numberDiff line change
@@ -2572,16 +2572,6 @@ version = "0.2.0"
25722572
source = "registry+https://github.com/rust-lang/crates.io-index"
25732573
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
25742574

2575-
[[package]]
2576-
name = "os_pipe"
2577-
version = "1.2.1"
2578-
source = "registry+https://github.com/rust-lang/crates.io-index"
2579-
checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
2580-
dependencies = [
2581-
"libc",
2582-
"windows-sys 0.59.0",
2583-
]
2584-
25852575
[[package]]
25862576
name = "overload"
25872577
version = "0.1.1"
@@ -3142,7 +3132,6 @@ dependencies = [
31423132
"gimli 0.31.1",
31433133
"libc",
31443134
"object 0.36.7",
3145-
"os_pipe",
31463135
"regex",
31473136
"serde_json",
31483137
"similar",

src/tools/run-make-support/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,5 @@ build_helper = { path = "../../build_helper" }
1414
serde_json = "1.0"
1515
libc = "0.2"
1616

17-
# FIXME(#137532): replace `os_pipe` with `anonymous_pipe` once it stabilizes and
18-
# reaches beta.
19-
os_pipe = "1.2.1"
20-
2117
[lib]
2218
crate-type = ["lib", "dylib"]

src/tools/run-make-support/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ pub use bstr;
4141
pub use gimli;
4242
pub use libc;
4343
pub use object;
44-
// FIXME(#137532): replace with std `anonymous_pipe` once it stabilizes and reaches beta.
45-
pub use os_pipe;
4644
pub use regex;
4745
pub use serde_json;
4846
pub use similar;

tests/run-make/broken-pipe-no-ice/rmake.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
use std::io::Read;
1515
use std::process::{Command, Stdio};
1616

17-
// FIXME(#137532): replace `os_pipe` dependency with std `anonymous_pipe` once that stabilizes and
18-
// reaches beta.
19-
use run_make_support::{env_var, os_pipe};
17+
use run_make_support::env_var;
2018

2119
#[derive(Debug, PartialEq)]
2220
enum Binary {
@@ -25,7 +23,7 @@ enum Binary {
2523
}
2624

2725
fn check_broken_pipe_handled_gracefully(bin: Binary, mut cmd: Command) {
28-
let (reader, writer) = os_pipe::pipe().unwrap();
26+
let (reader, writer) = std::io::pipe().unwrap();
2927
drop(reader); // close read-end
3028
cmd.stdout(writer).stderr(Stdio::piped());
3129

0 commit comments

Comments
 (0)