From 269f2ab521f7c2446959ddb644f68c960c7acc44 Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Tue, 18 Jun 2019 11:35:42 -0700
Subject: [PATCH] Add dyn to trait objects

---
 src/cursive.rs             | 2 +-
 src/event.rs               | 2 +-
 src/view/view_wrapper.rs   | 2 +-
 src/views/hideable_view.rs | 2 +-
 src/views/id_view.rs       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cursive.rs b/src/cursive.rs
index d9380f5..495da61 100644
--- a/src/cursive.rs
+++ b/src/cursive.rs
@@ -47,7 +47,7 @@ pub struct Cursive {
     cb_sink: Sender<Box<dyn CbFunc>>,
 
     // User-provided data.
-    user_data: Box<Any>,
+    user_data: Box<dyn Any>,
 
     fps: Option<NonZeroU32>,
     boring_frame_count: u32,
diff --git a/src/event.rs b/src/event.rs
index a9ebe16..239934d 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -27,7 +27,7 @@ pub struct Callback(Rc<Box<dyn Fn(&mut Cursive)>>);
 // TODO: remove the Box when Box<T: Sized> -> Rc<T> is possible
 
 /// A boxed callback that can be run on `&mut Any`.
-pub type AnyCb<'a> = Box<FnMut(&mut dyn Any) + 'a>;
+pub type AnyCb<'a> = Box<dyn FnMut(&mut dyn Any) + 'a>;
 
 /// A trigger that only selects some types of events.
 pub struct EventTrigger(Box<dyn Fn(&Event) -> bool>);
diff --git a/src/view/view_wrapper.rs b/src/view/view_wrapper.rs
index cd02340..7a46a3f 100644
--- a/src/view/view_wrapper.rs
+++ b/src/view/view_wrapper.rs
@@ -126,7 +126,7 @@ impl<T: ViewWrapper> View for T {
 
     fn call_on_any<'a>(
         &mut self, selector: &Selector<'_>,
-        callback: Box<FnMut(&mut dyn Any) + 'a>,
+        callback: Box<dyn FnMut(&mut dyn Any) + 'a>,
     ) {
         self.wrap_call_on_any(selector, callback)
     }
diff --git a/src/views/hideable_view.rs b/src/views/hideable_view.rs
index c19ba90..9458742 100644
--- a/src/views/hideable_view.rs
+++ b/src/views/hideable_view.rs
@@ -92,7 +92,7 @@ impl<V: View> ViewWrapper for HideableView<V> {
 
     fn wrap_call_on_any<'a>(
         &mut self, selector: &Selector<'_>,
-        callback: Box<FnMut(&mut dyn Any) + 'a>,
+        callback: Box<dyn FnMut(&mut dyn Any) + 'a>,
     ) {
         // We always run callbacks, even when invisible.
         self.view.call_on_any(selector, callback)
diff --git a/src/views/id_view.rs b/src/views/id_view.rs
index 39cd201..7800615 100644
--- a/src/views/id_view.rs
+++ b/src/views/id_view.rs
@@ -42,7 +42,7 @@ impl<V: View> IdView<V> {
 }
 
 // Shortcut for a boxed callback (for the wrap_call_on_any method).
-type BoxedCallback<'a> = Box<for<'b> FnMut(&'b mut dyn Any) + 'a>;
+type BoxedCallback<'a> = Box<dyn for<'b> FnMut(&'b mut dyn Any) + 'a>;
 
 impl<T: View + 'static> ViewWrapper for IdView<T> {
     type V = T;