Skip to content

Commit

Permalink
Auto merge of #6559 - euclio:relax-rustdoc-output, r=ehuss
Browse files Browse the repository at this point in the history
relax rustdoc output assertion

The output of this rustdoc error is changing in rust-lang/rust#56884. This PR relaxes an assertion on the output so that the test will still pass once the rustdoc PR is merged.
  • Loading branch information
bors committed Jan 17, 2019
2 parents 513d230 + eda10a4 commit 10e3230
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/testsuite/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,8 @@ fn output_not_captured() {

p.cargo("doc")
.without_status()
.with_stderr_contains("1 | ☃")
.with_stderr_contains(r"error: unknown start of token: \u{2603}")
.with_stderr_contains("[..]☃")
.with_stderr_contains(r"[..]unknown start of token: \u{2603}")
.run();
}

Expand Down

0 comments on commit 10e3230

Please sign in to comment.