about summary refs log tree commit diff
diff options
context:
space:
mode:
authortopecongiro <seuchida@gmail.com>2017-04-04 21:08:56 +0900
committertopecongiro <seuchida@gmail.com>2017-04-04 21:08:56 +0900
commitdb60b0b374ef4999e3c960a7230b18bcddf82ea0 (patch)
tree06b5a43d7883c6b8c5bc2335f6306d46819b87d7
parent09f42ee3331815347767b5a821813a927758a421 (diff)
downloadrust-db60b0b374ef4999e3c960a7230b18bcddf82ea0.tar.gz
rust-db60b0b374ef4999e3c960a7230b18bcddf82ea0.zip
Move 'coherence-overlapping-inherent-impl-trait' test to ui
-rw-r--r--src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs (renamed from src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs)2
-rw-r--r--src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr10
2 files changed, 11 insertions, 1 deletions
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
index 158d3606104..a72ad0351e3 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 00000000000..7f1ab929c6f
--- /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
+