Merge pull request #823 from GuillaumeGomez/dyn-warnings

Remove dyn warnings
gtk-rs · Jun 8, 2019 · 7a919db · 7a919db
2 parents 5908ecf + 3a683a2
commit 7a919db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/entry_completion.rs b/src/entry_completion.rs
@@ -17,7 +17,7 @@ pub trait EntryCompletionExtManual: 'static {
 impl<O: IsA<EntryCompletion>> EntryCompletionExtManual for O {
     fn get_entry(&self) -> Option<Entry> {
         unsafe {
-	    Option::<Widget>::from_glib_none(
+            Option::<Widget>::from_glib_none(
                 gtk_sys::gtk_entry_completion_get_entry(self.as_ref().to_glib_none().0)
             ).map(|widget| widget.downcast()
                                  .expect("Non-Entry widget received from get_entry method"))

diff --git a/src/list_store.rs b/src/list_store.rs
@@ -25,12 +25,16 @@ impl ListStore {
 }
 
 pub trait GtkListStoreExtManual: 'static {
-    fn insert_with_values(&self, position: Option<u32>, columns: &[u32], values: &[&ToValue])
-            -> TreeIter;
+    fn insert_with_values(
+        &self,
+        position: Option<u32>,
+        columns: &[u32],
+        values: &[&dyn ToValue],
+    ) -> TreeIter;
 
     fn reorder(&self, new_order: &[u32]);
 
-    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&ToValue]);
+    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&dyn ToValue]);
 
     fn set_value(&self, iter: &TreeIter, column: u32, value: &Value);
 }
@@ -40,7 +44,7 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
         &self,
         position: Option<u32>,
         columns: &[u32],
-        values: &[&ToValue],
+        values: &[&dyn ToValue],
     ) -> TreeIter {
         unsafe {
             assert!(position.unwrap_or(0) <= i32::max_value() as u32);
@@ -90,7 +94,7 @@ impl<O: IsA<ListStore>> GtkListStoreExtManual for O {
         }
     }
 
-    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&ToValue]) {
+    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&dyn ToValue]) {
         unsafe {
             assert_eq!(columns.len(), values.len());
             let n_columns = gtk_sys::gtk_tree_model_get_n_columns(self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0) as u32;

diff --git a/src/tree_store.rs b/src/tree_store.rs
@@ -29,12 +29,12 @@ pub trait TreeStoreExtManual: 'static {
         parent: Option<&TreeIter>,
         position: Option<u32>,
         columns: &[u32],
-        values: &[&ToValue],
+        values: &[&dyn ToValue],
     ) -> TreeIter;
 
     fn reorder(&self, parent: &TreeIter, new_order: &[u32]);
 
-    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&ToValue]);
+    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&dyn ToValue]);
 
     fn set_value(&self, iter: &TreeIter, column: u32, value: &Value);
 }
@@ -45,7 +45,7 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
         parent: Option<&TreeIter>,
         position: Option<u32>,
         columns: &[u32],
-        values: &[&ToValue],
+        values: &[&dyn ToValue],
     ) -> TreeIter {
         unsafe {
             assert!(position.unwrap_or(0) <= i32::max_value() as u32);
@@ -97,7 +97,7 @@ impl<O: IsA<TreeStore>> TreeStoreExtManual for O {
         }
     }
 
-    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&ToValue]) {
+    fn set(&self, iter: &TreeIter, columns: &[u32], values: &[&dyn ToValue]) {
         unsafe {
             assert_eq!(columns.len(), values.len());
             let n_columns = gtk_sys::gtk_tree_model_get_n_columns(self.as_ref().upcast_ref::<TreeModel>().to_glib_none().0) as u32;