about summary refs log tree commit diff
path: root/src/test/ui/span/dropck-object-cycle.rs
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/span/dropck-object-cycle.rs
parenta1d1d7a2c696c2afeff2ea206621a32d77fa49dc (diff)
downloadrust-eb4580a570069175e1290b294d91042a09f9fde3.tar.gz
rust-eb4580a570069175e1290b294d91042a09f9fde3.zip
Update ui test suite to use dyn
Diffstat (limited to 'src/test/ui/span/dropck-object-cycle.rs')
-rw-r--r--src/test/ui/span/dropck-object-cycle.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/span/dropck-object-cycle.rs b/src/test/ui/span/dropck-object-cycle.rs
index 8dc70ea252b..a26123d5246 100644
--- a/src/test/ui/span/dropck-object-cycle.rs
+++ b/src/test/ui/span/dropck-object-cycle.rs
@@ -8,7 +8,7 @@ trait Trait<'a> {
     fn short<'b>(&'b self) -> isize;
 }
 
-fn object_invoke1<'d>(x: &'d Trait<'d>) -> (isize, isize) { loop { } }
+fn object_invoke1<'d>(x: &'d dyn Trait<'d>) -> (isize, isize) { loop { } }
 
 trait MakerTrait {
     fn mk() -> Self;
@@ -18,12 +18,12 @@ fn make_val<T:MakerTrait>() -> T {
     MakerTrait::mk()
 }
 
-impl<'t> MakerTrait for Box<Trait<'t>+'static> {
-    fn mk() -> Box<Trait<'t>+'static> { loop { } }
+impl<'t> MakerTrait for Box<dyn Trait<'t>+'static> {
+    fn mk() -> Box<dyn Trait<'t>+'static> { loop { } }
 }
 
 pub fn main() {
-    let m : Box<Trait+'static> = make_val();
+    let m : Box<dyn Trait+'static> = make_val();
     assert_eq!(object_invoke1(&*m), (4,5));
     //~^ ERROR `*m` does not live long enough