From: bors <bors@rust-lang.org>
Date: Sat, 29 Apr 2017 12:59:45 +0000 (+0000)
Subject: Auto merge of #41588 - cengizIO:master, r=nikomatsakis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e326e86b47edcded3313944a81f126a633032d86;p=rust.git

Auto merge of #41588 - cengizIO:master, r=nikomatsakis

use diff crate for compile-fail test diagnostics #41474

Hello!

This fixes #41474

We were using a custom implementation to dump the differences between expected and actual outputs of compile-fail tests.

I removed this internal implementation and added `diff` crate as a new dependency to `compile-fail`.

Again, huge thanks to @nikomatsakis for guiding.
---

e326e86b47edcded3313944a81f126a633032d86
diff --cc src/tools/compiletest/src/runtest.rs
index d38b1d61ddd,0bab518fccb..731665ce034
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@@ -16,9 -17,9 +17,8 @@@ use errors::{self, ErrorKind, Error}
  use filetime::FileTime;
  use json;
  use header::TestProps;
 -use header;
  use procsrv;
  use test::TestPaths;
- use uidiff;
  use util::logv;
  
  use std::collections::HashSet;