Skip to content

Commit 6c21e9c

Browse files
committed
Rewrite and rename issue-35164 to rmake
1 parent 22692a1 commit 6c21e9c

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

Diff for: src/tools/run-make-support/src/command.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl CompletedProcess {
214214
/// Checks that `stderr` does not contain `unexpected`.
215215
#[track_caller]
216216
pub fn assert_stderr_not_contains<S: AsRef<str>>(&self, unexpected: S) -> &Self {
217-
assert_not_contains(&self.stdout_utf8(), unexpected);
217+
assert_not_contains(&self.stderr_utf8(), unexpected);
218218
self
219219
}
220220

Diff for: src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ run-make/issue-25581/Makefile
5454
run-make/issue-26006/Makefile
5555
run-make/issue-28595/Makefile
5656
run-make/issue-33329/Makefile
57-
run-make/issue-35164/Makefile
5857
run-make/issue-36710/Makefile
5958
run-make/issue-69368/Makefile
6059
run-make/issue-83045/Makefile

Diff for: tests/run-make/issue-35164/Makefile

-4
This file was deleted.
File renamed without changes.

Diff for: tests/run-make/json-error-no-offset/rmake.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// The byte positions in json format error logging used to have a small, difficult
2+
// to predict offset. This was changed to be the top of the file every time in #42973,
3+
// and this test checks that the measurements appearing in the standard error are correct.
4+
// See https://github.com/rust-lang/rust/issues/35164
5+
6+
use run_make_support::rustc;
7+
8+
fn main() {
9+
rustc()
10+
.input("main.rs")
11+
.error_format("json")
12+
.run()
13+
.assert_stderr_contains(r#""byte_start":23"#)
14+
.assert_stderr_contains(r#""byte_end":29"#);
15+
}

0 commit comments

Comments
 (0)