From db60b0b374ef4999e3c960a7230b18bcddf82ea0 Mon Sep 17 00:00:00 2001
From: topecongiro <seuchida@gmail.com>
Date: Tue, 4 Apr 2017 21:08:56 +0900
Subject: [PATCH] Move 'coherence-overlapping-inherent-impl-trait' test to ui

---
 .../coherence-overlapping-inherent-impl-trait.rs       |  2 +-
 .../coherence-overlapping-inherent-impl-trait.stderr   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 rename src/test/{compile-fail => ui/codemap_tests}/coherence-overlapping-inherent-impl-trait.rs (88%)
 create mode 100644 src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr

diff --git a/src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
similarity index 88%
rename from src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs
rename to src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
index 158d3606104a..a72ad0351e33 100644
--- a/src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
@@ -11,6 +11,6 @@
 #![allow(dead_code)]
 
 trait C {}
-impl C { fn f() {} } //~ ERROR duplicate definitions with name `f`
+impl C { fn f() {} }
 impl C { fn f() {} }
 fn main() { }
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
new file mode 100644
index 000000000000..7f1ab929c6fc
--- /dev/null
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
@@ -0,0 +1,10 @@
+error[E0592]: duplicate definitions with name `f`
+  --> $DIR/coherence-overlapping-inherent-impl-trait.rs:14:10
+   |
+14 | impl C { fn f() {} }
+   |          ^^^^^^^^^ duplicate definitions for `f`
+15 | impl C { fn f() {} }
+   |          --------- other definition for `f`
+
+error: aborting due to previous error
+