Skip to content

Commit f77af42

Browse files
committed
Fix run-make tests
1 parent 1f00719 commit f77af42

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum Binary {
2525
}
2626

2727
fn check_broken_pipe_handled_gracefully(bin: Binary, mut cmd: Command) {
28-
let (reader, writer) = std::io::pipe().unwrap();
28+
let (reader, writer) = std::pipe::pipe().unwrap();
2929
drop(reader); // close read-end
3030
cmd.stdout(writer).stderr(Stdio::piped());
3131

Diff for: tests/run-make/rustdoc-default-output/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// ensures the output of rustdoc's help menu is as expected.
44
// See https://github.com/rust-lang/rust/issues/88756
55

6-
use run_make_support::{bare_rustdoc, diff};
6+
use run_make_support::{diff, rustdoc};
77

88
fn main() {
9-
let out = bare_rustdoc().run().stdout_utf8();
9+
let out = rustdoc().run().stdout_utf8();
1010
diff()
1111
.expected_file("output-default.stdout")
1212
.actual_text("actual", out)

Diff for: tests/run-make/version-verbose-commit-hash/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
//@ needs-git-hash
77

8-
use run_make_support::{bare_rustc, bare_rustdoc, regex};
8+
use run_make_support::{bare_rustc, regex, rustdoc};
99

1010
fn main() {
1111
let out_rustc =
1212
bare_rustc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
1313
let out_rustdoc =
14-
bare_rustdoc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
14+
rustdoc().arg("--version").arg("--verbose").run().stdout_utf8().to_lowercase();
1515
let re =
1616
regex::Regex::new(r#"commit-hash: [0-9a-f]{40}\ncommit-date: [0-9]{4}-[0-9]{2}-[0-9]{2}"#)
1717
.unwrap();

0 commit comments

Comments
 (0)