Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Apr 1, 2020

This PR undoes a change made during #69916, which became unnecessary during review but was left in by accident, and which isn't correct due to libtest using std::io::set_print, which overwrites the println! behavior but not writeln!(std::io::stdout(), ...).

The effect of using writeln!(std::io::stdout(), ...) was that the diff output would show while running the tests, instead of at the end, when failing tests are listed.

r? @Mark-Simulacrum cc @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 1, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 1, 2020

📌 Commit f181778 has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Apr 1, 2020

🌲 The tree is currently closed for pull requests below priority 500, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 1, 2020
…k-Simulacrum

compiletest: don't use `std::io::stdout()`, as it bypasses `set_print`.

This PR undoes a change made during rust-lang#69916, which became unnecessary during review but was left in by accident, and which isn't correct due to `libtest` using `std::io::set_print`, which overwrites the `println!` behavior but *not* `writeln!(std::io::stdout(), ...)`.

The effect of using `writeln!(std::io::stdout(), ...)` was that the diff output would show *while* running the tests, instead of at the end, when failing tests are listed.

r? @Mark-Simulacrum cc @oli-obk
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2020
Rollup of 6 pull requests

Successful merges:

 - rust-lang#70535 (Track the finalizing node in the specialization graph)
 - rust-lang#70590 (Miri: make backtrace function names and spans match up)
 - rust-lang#70616 (rustc_target::abi: rename FieldPlacement to FieldsShape.)
 - rust-lang#70626 (cargotest: remove webrender)
 - rust-lang#70649 (clean up E0468 explanation)
 - rust-lang#70662 (compiletest: don't use `std::io::stdout()`, as it bypasses `set_print`.)

Failed merges:

r? @ghost
@bors bors merged commit 7d4d450 into rust-lang:master Apr 1, 2020
@eddyb eddyb deleted the compiletest-stdout-fix branch April 2, 2020 06:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants