Simplify CI and formatting configuration

Author: laurmaedje

.github/workflows/ci.yml

@@ -0,0 +1,11 @@
+name: Continuous integration
+on: [push, pull_request]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo build
+      - run: cargo test

.github/workflows/rust.yml

@@ -1,11 +1,6 @@
-unstable_features = true
-
-overflow_delimited_expr = true
-spaces_around_ranges = true
-use_field_init_shorthand = true
-merge_derives = false
-
+use_small_heuristics = "Max"
 max_width = 90
-struct_lit_width = 40
 chain_width = 70
-single_line_if_else_max_width = 60
+struct_lit_width = 50
+use_field_init_shorthand = true
+merge_derives = false

rustfmt.toml

@@ -167,13 +167,12 @@ pub fn write_gradients(
         shading.shading_type(pending.shading_type);
         shading.color_space().srgb();
         shading.function(func);
-        shading.coords(pending.coords.into_iter().take(
-            if pending.shading_type == ShadingType::Axial {
-                4
-            } else {
-                6
-            },
-        ));
+        shading.coords(
+            pending
+                .coords
+                .into_iter()
+                .take(if pending.shading_type == ShadingType::Axial { 4 } else { 6 }),
+        );
         shading.extend([true, true]);
     }
 

src/defer.rs

@@ -443,17 +443,10 @@ fn get_sizings(tree: &Tree, options: &Options) -> (CoordToPdf, Rect) {
         (native_size.width(), native_size.height())
     };
 
-    let c = CoordToPdf::new(
-        viewport,
-        options.dpi,
-        tree.svg_node().view_box,
-        options.aspect,
-    );
-
-    (
-        c,
-        Rect::new(0.0, 0.0, c.px_to_pt(viewport.0), c.px_to_pt(viewport.1)),
-    )
+    let c =
+        CoordToPdf::new(viewport, options.dpi, tree.svg_node().view_box, options.aspect);
+
+    (c, Rect::new(0.0, 0.0, c.px_to_pt(viewport.0), c.px_to_pt(viewport.1)))
 }
 
 fn preregister(tree: &Tree, writer: &mut PdfWriter, ctx: &mut Context) {
@@ -510,7 +503,11 @@ fn content_stream<'a>(
 
     let res = content.finish();
 
-    if ctx.compress { deflate(&res) } else { res }
+    if ctx.compress {
+        deflate(&res)
+    } else {
+        res
+    }
 }
 
 /// Draw a clipping path into a content stream.
@@ -784,7 +781,7 @@ mod tests {
             let buf = convert_str(&doc, options).unwrap();
 
             let len = base_name.len();
-            let file_name = format!("{}.pdf", &base_name[0 .. len - 4]);
+            let file_name = format!("{}.pdf", &base_name[0..len - 4]);
 
             std::fs::write(format!("target/{}", file_name), buf).unwrap();
         }

src/lib.rs

@@ -130,13 +130,8 @@ fn render_path_partial(
     // Soft Mask. Because we want the masks to intersect instead, we wrap
     // the path in a transparency group instead.
     let mut xobj_content = if let Some(alpha_func) = fill_g_alpha {
-        let smask_form_ref = prep_shading(
-            alpha_func,
-            fill_gradient.as_ref().unwrap(),
-            bbox,
-            writer,
-            ctx,
-        );
+        let smask_form_ref =
+            prep_shading(alpha_func, fill_gradient.as_ref().unwrap(), bbox, writer, ctx);
 
         Some(start_wrap(smask_form_ref, content, ctx))
     } else if let Some(alpha_func) = stroke_g_alpha {
@@ -267,11 +262,7 @@ fn render_path_partial(
 
     draw_path(&path.data.0, path.transform, content, &ctx.c);
 
-    match (
-        path.fill.as_ref().map(|f| f.rule),
-        fill,
-        path.stroke.is_some() && stroke,
-    ) {
+    match (path.fill.as_ref().map(|f| f.rule), fill, path.stroke.is_some() && stroke) {
         (Some(FillRule::NonZero), true, true) => content.fill_nonzero_and_stroke(),
         (Some(FillRule::EvenOdd), true, true) => content.fill_even_odd_and_stroke(),
         (Some(FillRule::NonZero), true, false) => content.fill_nonzero(),
@@ -367,13 +358,12 @@ fn prep_shading(
     shading.shading_type(gradient.shading_type);
     shading.color_space().d65_gray();
     shading.function(alpha_func);
-    shading.coords(gradient.transformed_coords(&ctx.c, bbox).into_iter().take(
-        if gradient.shading_type == ShadingType::Axial {
-            4
-        } else {
-            6
-        },
-    ));
+    shading.coords(
+        gradient
+            .transformed_coords(&ctx.c, bbox)
+            .into_iter()
+            .take(if gradient.shading_type == ShadingType::Axial { 4 } else { 6 }),
+    );
     shading.extend([true, true]);
     shading.finish();
 
@@ -452,11 +442,7 @@ fn prep_pattern(
     } else if pattern.content_units == Units::ObjectBoundingBox {
         let viewbox = ViewBox {
             rect: usvg::Rect::new(0.0, 0.0, 1.0, 1.0).unwrap(),
-            aspect: AspectRatio {
-                defer: false,
-                align: Align::None,
-                slice: false,
-            },
+            aspect: AspectRatio { defer: false, align: Align::None, slice: false },
         };
 
         CoordToPdf::new((bbox.width(), bbox.height()), ctx.c.dpi(), viewbox, None)
@@ -522,14 +508,8 @@ impl Render for usvg::Group {
 
         // Every group is an isolated transparency group, it needs to be painted
         // onto its own canvas.
-        let mut form = form_xobject(
-            writer,
-            group_ref,
-            &child_content,
-            pdf_bbox,
-            ctx.compress,
-            true,
-        );
+        let mut form =
+            form_xobject(writer, group_ref, &child_content, pdf_bbox, ctx.compress, true);
 
         let mut resources = form.resources();
         ctx.pop(&mut resources);
@@ -577,12 +557,10 @@ impl Render for usvg::Image {
             let image_ref = ctx.alloc_ref();
 
             #[cfg(any(feature = "png", feature = "jpeg", feature = "gif"))]
-            let set_image_props = |
-                image: &mut ImageXObject,
-                raster_size: &mut Option<(u32, u32)>,
-                decoded: &DynamicImage,
-                grey: bool,
-            | {
+            let set_image_props = |image: &mut ImageXObject,
+                                   raster_size: &mut Option<(u32, u32)>,
+                                   decoded: &DynamicImage,
+                                   grey: bool| {
                 let color = decoded.color();
                 *raster_size = Some((decoded.width(), decoded.height()));
                 image.width(decoded.width() as i32);
@@ -871,11 +849,7 @@ impl Gradient {
         c: &CoordToPdf,
         bbox: usvg::Rect,
     ) -> [f32; 6] {
-        let max = if bbox.width() > bbox.height() {
-            bbox.width()
-        } else {
-            bbox.height()
-        };
+        let max = if bbox.width() > bbox.height() { bbox.width() } else { bbox.height() };
 
         let coords = if self.transform_coords {
             let (x1, y1) = c.point((
@@ -897,22 +871,13 @@ impl Gradient {
         } else {
             let (x1, y1) = c.point((self.coords[0], self.coords[1]));
             let (x2, y2) = c.point((self.coords[2], self.coords[3]));
-            [
-                x1,
-                y1,
-                x2,
-                y2,
-                c.px_to_pt(self.coords[4]),
-                c.px_to_pt(self.coords[5]),
-            ]
+            [x1, y1, x2, y2, c.px_to_pt(self.coords[4]), c.px_to_pt(self.coords[5])]
         };
 
         if self.shading_type == ShadingType::Axial {
             [coords[0], coords[1], coords[2], coords[3], 0.0, 0.0]
         } else {
-            [
-                coords[0], coords[1], coords[4], coords[2], coords[3], coords[5],
-            ]
+            [coords[0], coords[1], coords[4], coords[2], coords[3], coords[5]]
         }
     }
 }

src/render.rs

@@ -33,7 +33,11 @@ impl CoordToPdf {
         let viewport_ratio = viewport.0 / viewport.1;
 
         let aspect = if let Some(aspect) = aspect_ratio {
-            if aspect.defer { viewbox.aspect } else { aspect }
+            if aspect.defer {
+                viewbox.aspect
+            } else {
+                aspect
+            }
         } else {
             viewbox.aspect
         };