about summary refs log tree commit diff
path: root/src/test/ui/codemap_tests
diff options
context:
space:
mode:
authormemoryruins <memoryruinsmusic@gmail.com>2019-05-28 14:46:13 -0400
committermemoryruins <memoryruinsmusic@gmail.com>2019-05-29 00:57:31 -0400
commiteb4580a570069175e1290b294d91042a09f9fde3 (patch)
treefdb0ef28968512495204bd7a3dc3253cdb20365a /src/test/ui/codemap_tests
parenta1d1d7a2c696c2afeff2ea206621a32d77fa49dc (diff)
downloadrust-eb4580a570069175e1290b294d91042a09f9fde3.tar.gz
rust-eb4580a570069175e1290b294d91042a09f9fde3.zip
Update ui test suite to use dyn
Diffstat (limited to 'src/test/ui/codemap_tests')
-rw-r--r--src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs4
-rw-r--r--src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr10
-rw-r--r--src/test/ui/codemap_tests/two_files_data.rs2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
index f35fbad7cd6..414acfd84ce 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
 trait C {}
-impl C { fn f() {} } //~ ERROR duplicate
-impl C { fn f() {} }
+impl dyn C { fn f() {} } //~ ERROR duplicate
+impl dyn 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
index 16cdca774ba..a97161b131d 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
@@ -1,10 +1,10 @@
 error[E0592]: duplicate definitions with name `f`
-  --> $DIR/coherence-overlapping-inherent-impl-trait.rs:4:10
+  --> $DIR/coherence-overlapping-inherent-impl-trait.rs:4:14
    |
-LL | impl C { fn f() {} }
-   |          ^^^^^^^^^ duplicate definitions for `f`
-LL | impl C { fn f() {} }
-   |          --------- other definition for `f`
+LL | impl dyn C { fn f() {} }
+   |              ^^^^^^^^^ duplicate definitions for `f`
+LL | impl dyn C { fn f() {} }
+   |              --------- other definition for `f`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/two_files_data.rs b/src/test/ui/codemap_tests/two_files_data.rs
index db8ab14e673..b4d2f5d3c6d 100644
--- a/src/test/ui/codemap_tests/two_files_data.rs
+++ b/src/test/ui/codemap_tests/two_files_data.rs
@@ -2,4 +2,4 @@
 
 trait Foo { }
 
-type Bar = Foo;
+type Bar = dyn Foo;