Fix some new warnings

components/canvas/azure_backend.rs

@@ -55,7 +55,7 @@ impl Backend for AzureBackend {
         &mut self,
         style: FillOrStrokeStyle,
         state: &mut CanvasPaintState<'a>,
-        drawtarget: &GenericDrawTarget,
+        drawtarget: &dyn GenericDrawTarget,
     ) {
         if let Some(pattern) = style.to_azure_pattern(drawtarget) {
             state.fill_style = Pattern::Azure(pattern)
@@ -66,7 +66,7 @@ impl Backend for AzureBackend {
         &mut self,
         style: FillOrStrokeStyle,
         state: &mut CanvasPaintState<'a>,
-        drawtarget: &GenericDrawTarget,
+        drawtarget: &dyn GenericDrawTarget,
     ) {
         if let Some(pattern) = style.to_azure_pattern(drawtarget) {
             state.stroke_style = Pattern::Azure(pattern)
@@ -84,7 +84,7 @@ impl Backend for AzureBackend {
             .set_composition_op(op.to_azure_style());
     }
 
-    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<GenericDrawTarget> {
+    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget> {
         // FIXME(nox): Why is the size made of i32 values?
         Box::new(DrawTarget::new(
             BackendType::Skia,
@@ -222,7 +222,7 @@ impl GenericDrawTarget for azure_hl::DrawTarget {
         GradientStops::Azure(self.create_gradient_stops(&gradient_stops, extend_mode.into_azure()))
     }
 
-    fn create_path_builder(&self) -> Box<GenericPathBuilder> {
+    fn create_path_builder(&self) -> Box<dyn GenericPathBuilder> {
         Box::new(self.create_path_builder())
     }
 
@@ -230,7 +230,7 @@ impl GenericDrawTarget for azure_hl::DrawTarget {
         &self,
         size: &Size2D<i32>,
         format: SurfaceFormat,
-    ) -> Box<GenericDrawTarget> {
+    ) -> Box<dyn GenericDrawTarget> {
         Box::new(self.create_similar_draw_target(size, format.into_azure()))
     }
     fn create_source_surface_from_data(
@@ -378,7 +378,7 @@ impl GenericDrawTarget for azure_hl::DrawTarget {
     }
 
     #[allow(unsafe_code)]
-    fn snapshot_data(&self, f: &Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
+    fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
         unsafe { f(self.snapshot().get_data_surface().data()) }
     }
 
@@ -619,11 +619,11 @@ impl ToAzureStyle for CompositionOrBlending {
 }
 
 pub trait ToAzurePattern {
-    fn to_azure_pattern(&self, drawtarget: &GenericDrawTarget) -> Option<azure_hl::Pattern>;
+    fn to_azure_pattern(&self, drawtarget: &dyn GenericDrawTarget) -> Option<azure_hl::Pattern>;
 }
 
 impl ToAzurePattern for FillOrStrokeStyle {
-    fn to_azure_pattern(&self, drawtarget: &GenericDrawTarget) -> Option<azure_hl::Pattern> {
+    fn to_azure_pattern(&self, drawtarget: &dyn GenericDrawTarget) -> Option<azure_hl::Pattern> {
         Some(match *self {
             FillOrStrokeStyle::Color(ref color) => {
                 azure_hl::Pattern::Color(ColorPattern::new(color.to_azure_style()))
@@ -747,7 +747,7 @@ impl Path {
     pub fn transformed_copy_to_builder(
         &self,
         transform: &Transform2D<f32>,
-    ) -> Box<GenericPathBuilder> {
+    ) -> Box<dyn GenericPathBuilder> {
         Box::new(self.as_azure().transformed_copy_to_builder(transform))
     }
 
@@ -755,7 +755,7 @@ impl Path {
         self.as_azure().contains_point(x, y, path_transform)
     }
 
-    pub fn copy_to_builder(&self) -> Box<GenericPathBuilder> {
+    pub fn copy_to_builder(&self) -> Box<dyn GenericPathBuilder> {
         Box::new(self.as_azure().copy_to_builder())
     }
 }

components/canvas/canvas_data.rs

@@ -26,9 +26,9 @@ enum PathState {
     /// Path builder in user-space. If a transform has been applied
     /// but no further path operations have occurred, it is stored
     /// in the optional field.
-    UserSpacePathBuilder(Box<GenericPathBuilder>, Option<Transform2D<f32>>),
+    UserSpacePathBuilder(Box<dyn GenericPathBuilder>, Option<Transform2D<f32>>),
     /// Path builder in device-space.
-    DeviceSpacePathBuilder(Box<GenericPathBuilder>),
+    DeviceSpacePathBuilder(Box<dyn GenericPathBuilder>),
     /// Path in user-space. If a transform has been applied but
     /// but no further path operations have occurred, it is stored
     /// in the optional field.
@@ -61,20 +61,20 @@ pub trait Backend {
         &mut self,
         style: FillOrStrokeStyle,
         state: &mut CanvasPaintState<'a>,
-        drawtarget: &GenericDrawTarget,
+        drawtarget: &dyn GenericDrawTarget,
     );
     fn set_stroke_style<'a>(
         &mut self,
         style: FillOrStrokeStyle,
         state: &mut CanvasPaintState<'a>,
-        drawtarget: &GenericDrawTarget,
+        drawtarget: &dyn GenericDrawTarget,
     );
     fn set_global_composition<'a>(
         &mut self,
         op: CompositionOrBlending,
         state: &mut CanvasPaintState<'a>,
     );
-    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<GenericDrawTarget>;
+    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget>;
     fn recreate_paint_state<'a>(&self, state: &CanvasPaintState<'a>) -> CanvasPaintState<'a>;
     fn size_from_pattern(&self, rect: &Rect<f32>, pattern: &Pattern) -> Option<Size2D<f32>>;
 }
@@ -117,7 +117,7 @@ pub trait GenericPathBuilder {
 /// A wrapper around a stored PathBuilder and an optional transformation that should be
 /// applied to any points to ensure they are in the matching device space.
 struct PathBuilderRef<'a> {
-    builder: &'a Box<GenericPathBuilder>,
+    builder: &'a Box<dyn GenericPathBuilder>,
     transform: Transform2D<f32>,
 }
 
@@ -215,12 +215,12 @@ pub trait GenericDrawTarget {
         gradient_stops: Vec<GradientStop>,
         extend_mode: ExtendMode,
     ) -> GradientStops;
-    fn create_path_builder(&self) -> Box<GenericPathBuilder>;
+    fn create_path_builder(&self) -> Box<dyn GenericPathBuilder>;
     fn create_similar_draw_target(
         &self,
         size: &Size2D<i32>,
         format: SurfaceFormat,
-    ) -> Box<GenericDrawTarget>;
+    ) -> Box<dyn GenericDrawTarget>;
     fn create_source_surface_from_data(
         &self,
         data: &[u8],
@@ -275,7 +275,7 @@ pub trait GenericDrawTarget {
         stroke_options: &StrokeOptions,
         draw_options: &DrawOptions,
     );
-    fn snapshot_data(&self, f: &Fn(&[u8]) -> Vec<u8>) -> Vec<u8>;
+    fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8>;
     fn snapshot_data_owned(&self) -> Vec<u8>;
 }
 
@@ -377,8 +377,8 @@ pub enum Filter {
 }
 
 pub struct CanvasData<'a> {
-    backend: Box<Backend>,
-    drawtarget: Box<GenericDrawTarget>,
+    backend: Box<dyn Backend>,
+    drawtarget: Box<dyn GenericDrawTarget>,
     path_state: Option<PathState>,
     state: CanvasPaintState<'a>,
     saved_states: Vec<CanvasPaintState<'a>>,
@@ -392,12 +392,12 @@ pub struct CanvasData<'a> {
 }
 
 #[cfg(feature = "azure_backend")]
-fn create_backend() -> Box<Backend> {
+fn create_backend() -> Box<dyn Backend> {
     Box::new(crate::azure_backend::AzureBackend)
 }
 
 #[cfg(feature = "raqote_backend")]
-fn create_backend() -> Box<Backend> {
+fn create_backend() -> Box<dyn Backend> {
     Box::new(crate::raqote_backend::RaqoteBackend)
 }
 
@@ -442,7 +442,7 @@ impl<'a> CanvasData<'a> {
             image_data.into()
         };
 
-        let writer = |draw_target: &GenericDrawTarget| {
+        let writer = |draw_target: &dyn GenericDrawTarget| {
             write_image(
                 draw_target,
                 image_data,
@@ -498,7 +498,7 @@ impl<'a> CanvasData<'a> {
         );
 
         if self.need_to_draw_shadow() {
-            self.draw_with_shadow(&draw_rect, |new_draw_target: &GenericDrawTarget| {
+            self.draw_with_shadow(&draw_rect, |new_draw_target: &dyn GenericDrawTarget| {
                 new_draw_target.fill_rect(
                     &draw_rect,
                     self.state.fill_style.clone(),
@@ -524,7 +524,7 @@ impl<'a> CanvasData<'a> {
         }
 
         if self.need_to_draw_shadow() {
-            self.draw_with_shadow(&rect, |new_draw_target: &GenericDrawTarget| {
+            self.draw_with_shadow(&rect, |new_draw_target: &dyn GenericDrawTarget| {
                 new_draw_target.stroke_rect(
                     rect,
                     self.state.stroke_style.clone(),
@@ -1023,7 +1023,7 @@ impl<'a> CanvasData<'a> {
                 self.state.shadow_blur != 0.0f64)
     }
 
-    fn create_draw_target_for_shadow(&self, source_rect: &Rect<f32>) -> Box<GenericDrawTarget> {
+    fn create_draw_target_for_shadow(&self, source_rect: &Rect<f32>) -> Box<dyn GenericDrawTarget> {
         let draw_target = self.drawtarget.create_similar_draw_target(
             &Size2D::new(
                 source_rect.size.width as i32,
@@ -1040,7 +1040,7 @@ impl<'a> CanvasData<'a> {
 
     fn draw_with_shadow<F>(&self, rect: &Rect<f32>, draw_shadow_source: F)
     where
-        F: FnOnce(&GenericDrawTarget),
+        F: FnOnce(&dyn GenericDrawTarget),
     {
         let shadow_src_rect = self.state.transform.transform_rect(rect);
         let new_draw_target = self.create_draw_target_for_shadow(&shadow_src_rect);
@@ -1116,7 +1116,7 @@ pub struct CanvasPaintState<'a> {
 /// dest_rect: Area of the destination target where the pixels will be copied
 /// smoothing_enabled: It determines if smoothing is applied to the image result
 fn write_image(
-    draw_target: &GenericDrawTarget,
+    draw_target: &dyn GenericDrawTarget,
     image_data: Vec<u8>,
     image_size: Size2D<f64>,
     dest_rect: Rect<f64>,

components/canvas/raqote_backend.rs

@@ -36,7 +36,7 @@ impl Backend for RaqoteBackend {
         &mut self,
         _style: FillOrStrokeStyle,
         _state: &mut CanvasPaintState<'a>,
-        _drawtarget: &GenericDrawTarget,
+        _drawtarget: &dyn GenericDrawTarget,
     ) {
         unimplemented!()
     }
@@ -45,7 +45,7 @@ impl Backend for RaqoteBackend {
         &mut self,
         _style: FillOrStrokeStyle,
         _state: &mut CanvasPaintState<'a>,
-        _drawtarget: &GenericDrawTarget,
+        _drawtarget: &dyn GenericDrawTarget,
     ) {
         unimplemented!()
     }
@@ -58,7 +58,7 @@ impl Backend for RaqoteBackend {
         unimplemented!()
     }
 
-    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<GenericDrawTarget> {
+    fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget> {
         Box::new(raqote::DrawTarget::new(
             size.width as i32,
             size.height as i32,
@@ -121,7 +121,7 @@ impl Path {
     pub fn transformed_copy_to_builder(
         &self,
         _transform: &Transform2D<f32>,
-    ) -> Box<GenericPathBuilder> {
+    ) -> Box<dyn GenericPathBuilder> {
         unimplemented!()
     }
 
@@ -129,7 +129,7 @@ impl Path {
         unimplemented!()
     }
 
-    pub fn copy_to_builder(&self) -> Box<GenericPathBuilder> {
+    pub fn copy_to_builder(&self) -> Box<dyn GenericPathBuilder> {
         unimplemented!()
     }
 }
@@ -156,7 +156,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
         unimplemented!()
     }
 
-    fn create_path_builder(&self) -> Box<GenericPathBuilder> {
+    fn create_path_builder(&self) -> Box<dyn GenericPathBuilder> {
         unimplemented!()
     }
 
@@ -164,7 +164,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
         &self,
         _size: &Size2D<i32>,
         _format: SurfaceFormat,
-    ) -> Box<GenericDrawTarget> {
+    ) -> Box<dyn GenericDrawTarget> {
         unimplemented!()
     }
     fn create_source_surface_from_data(
@@ -246,13 +246,13 @@ impl GenericDrawTarget for raqote::DrawTarget {
         &self,
         _rect: &Rect<f32>,
         _pattern: Pattern,
-        _stroke_options: &StrokeOptions,
+        _stroke_options: &StrokeOptions<'_>,
         _draw_options: &DrawOptions,
     ) {
         unimplemented!()
     }
 
-    fn snapshot_data(&self, _f: &Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
+    fn snapshot_data(&self, _f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
         unimplemented!()
     }