From: Corey Farwell <coreyf@rwell.org>
Date: Tue, 23 May 2017 04:15:43 +0000 (-0400)
Subject: Rollup merge of #42144 - cengizIO:master, r=nikomatsakis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9739e8dbc9e65a7ccbba65d987c0491804796c7b;p=rust.git

Rollup merge of #42144 - cengizIO:master, r=nikomatsakis

make ui test output patch compatible #41948

Hello!

Previously with #41474 I've changed the internals of UI test output comparison mechanism.

That change didn't change the diff format that we were producing but we needed to improve it anyway.

This makes unified diff lines a little bit more `patch` compatible.

Also I tried to introduce a unit test to check this but couldn't decide which of the following to implement:

1. Should I replace `println` macros with `Writer`s? And access the produced output within a test?
2. Should I add an external test (something like `src/test/run-pass/command-exec.rs`)
3. There are crates that capture `stdout`. Are they safe to use here? (I don't think so)

Thanks!

cc @nikomatsakis
---

9739e8dbc9e65a7ccbba65d987c0491804796c7b