post rebase fixups

Cargo.toml

@@ -45,7 +45,7 @@ parking_lot = "0.12"
 bytemuck = { version = "1.12.1", features = ["derive"] }
 smallvec = "1.8.0"
 moscato = { git = "https://github.com/dfrg/pinot", rev = "59db153" }
-peniko = { git = "https://github.com/linebender/peniko", rev = "9526fb1afa85493cf537afac76c1e38dc7c76d23" }
+peniko = { git = "https://github.com/linebender/peniko", rev = "cafdac9a211a0fb2fec5656bd663d1ac770bcc81" }
 
 [workspace.dependencies]
 wgpu = "0.15"

examples/scenes/src/test_scenes.rs

@@ -130,7 +130,7 @@ fn animated_text(sb: &mut SceneBuilder, params: &mut SceneParams) {
         Color::WHITE,
         Affine::translate((110.0, 700.0)),
         // Add a skew to simulate an oblique font.
-        Some(Affine::new([1., 0., 20f64.to_radians().tan(), 1., 0., 0.])),
+        Some(Affine::skew(20f64.to_radians().tan(), 0.0)),
         &Stroke::new(1.0),
         s,
     );

examples/with_winit/src/lib.rs

@@ -268,7 +268,6 @@ fn run(
                 base_color: None,
             };
             (example_scene.function)(&mut builder, &mut scene_params);
-            builder.finish();
 
             // If the user specifies a base color in the CLI we use that. Otherwise we use any
             // color specified by the scene. The default is black.
@@ -291,7 +290,6 @@ fn run(
                 transform = transform * Affine::scale(scale_factor);
             }
             builder.append(&fragment, Some(transform));
-            builder.finish();
             let surface_texture = render_state
                 .surface
                 .surface

src/encoding/draw.rs

@@ -15,7 +15,7 @@
 // Also licensed under MIT license, at your choice.
 
 use bytemuck::{Pod, Zeroable};
-use peniko::{BlendMode, Color, Fill, Stroke};
+use peniko::{BlendMode, Color};
 
 use super::Monoid;
 

src/encoding/encoding.rs

@@ -19,7 +19,6 @@ use super::{
     PathEncoder, PathTag, Transform,
 };
 
-use bytemuck::{Pod, Zeroable};
 use peniko::{kurbo::Shape, BlendMode, BrushRef, ColorStop, Extend, GradientKind};
 
 /// Encoded data streams for a scene.