[rust-edition] 2024

Author: aslpavel

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "rasterize"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Pavel Aslanov <asl.pavel@gmail.com>"]
 description = "Simple and small 2D rendering library"
-edition = "2021"
+edition = "2024"
 include = [
     "**/*.rs",
     "src/svg-colors.txt",

benches/color_bench.rs

@@ -1,4 +1,4 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
+use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
 use rasterize::{
     linear_to_srgb,
     simd::{f32x4, l2s},

benches/rasterize_bench.rs

@@ -1,6 +1,6 @@
 #![deny(warnings)]
 
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use criterion::{BenchmarkId, Criterion, Throughput, black_box, criterion_group, criterion_main};
 use rasterize::*;
 use std::{
     fs::File,

benches/scene_bench.rs

@@ -1,6 +1,6 @@
 #![deny(warnings)]
-use criterion::{criterion_group, criterion_main, Criterion, Throughput};
-use rasterize::{BBox, FillRule, LinColor, Path, Point, Scalar, Scene, Size, Transform, RGBA};
+use criterion::{Criterion, Throughput, criterion_group, criterion_main};
+use rasterize::{BBox, FillRule, LinColor, Path, Point, RGBA, Scalar, Scene, Size, Transform};
 use std::sync::Arc;
 
 fn many_cirles_benchmark(c: &mut Criterion) {

examples/hatchet.rs

@@ -356,8 +356,14 @@ fn generate_font(
     glyphs: impl IntoIterator<Item = Glyph>,
 ) -> Result<(), std::io::Error> {
     writeln!(out, "<?xml version=\"1.0\" standalone=\"no\"?>")?;
-    writeln!(out, "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\" >")?;
-    writeln!(out, "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\"> ")?;
+    writeln!(
+        out,
+        "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\" >"
+    )?;
+    writeln!(
+        out,
+        "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\"> "
+    )?;
     writeln!(out, "<defs>")?;
     writeln!(out, "  <font horiz-adv-x=\"500\">")?;
     writeln!(out, "  <font-face")?;

examples/prebench.rs

@@ -1,7 +1,7 @@
 use std::{sync::Arc, time::Instant};
 
 use rasterize::{
-    BBox, FillRule, Image, LinColor, Path, Point, Scalar, Scene, Size, Transform, RGBA,
+    BBox, FillRule, Image, LinColor, Path, Point, RGBA, Scalar, Scene, Size, Transform,
 };
 
 type Error = Box<dyn std::error::Error>;

examples/rasterize.rs

@@ -8,7 +8,7 @@ use std::{
     io::{BufWriter, Read},
     sync::Arc,
 };
-use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt::format::FmtSpan};
 
 type Error = Box<dyn std::error::Error>;
 

examples/scene.rs

@@ -6,7 +6,7 @@ use std::{
     io::{BufReader, BufWriter},
 };
 use tracing::debug_span;
-use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt::format::FmtSpan};
 
 type Error = Box<dyn std::error::Error>;
 

src/color.rs

@@ -1,7 +1,7 @@
-use crate::{simd::f32x4, Paint, Point, Scalar, Transform, Units};
+use crate::{Paint, Point, Scalar, Transform, Units, simd::f32x4};
 use bytemuck::{Pod, Zeroable};
 #[cfg(feature = "serde")]
-use serde::{de::DeserializeSeed, Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, de::DeserializeSeed};
 use std::{
     collections::HashMap,
     fmt,
@@ -115,7 +115,7 @@ impl RGBA {
             };
             let mut hex = bytes
                 .chunks(2)
-                .map(|pair| Ok(digit(pair[0])? << 4 | digit(pair[1])?));
+                .map(|pair| Ok((digit(pair[0])? << 4) | digit(pair[1])?));
             RGBA::new(
                 hex.next().unwrap_or(Ok(0))?,
                 hex.next().unwrap_or(Ok(0))?,

src/curve.rs

@@ -1,12 +1,12 @@
 //! All the things you need to handle bezier curves
 
 use crate::{
+    BBox, EPSILON, EllipArc, LineCap, LineJoin, Point, Scalar, StrokeStyle, SvgParserError,
+    SvgPathCmd, SvgPathParser, Transform,
     utils::{
-        clamp, cubic_solve, integrate_quadrature, quadratic_solve, ArrayIter, M3x3, M4x4,
-        QUADRATURE_16, QUADRATURE_32,
+        ArrayIter, M3x3, M4x4, QUADRATURE_16, QUADRATURE_32, clamp, cubic_solve,
+        integrate_quadrature, quadratic_solve,
     },
-    BBox, EllipArc, LineCap, LineJoin, Point, Scalar, StrokeStyle, SvgParserError, SvgPathCmd,
-    SvgPathParser, Transform, EPSILON,
 };
 use std::{fmt, io::Cursor, str::FromStr};
 
@@ -834,7 +834,14 @@ impl Curve for Cubic {
     fn roots(&self) -> CurveRoots {
         let mut result = CurveRoots::new();
         // curve(t)_y = 0
-        let Self([Point([_, y0]), Point([_, y1]), Point([_, y2]), Point([_, y3])]) = *self;
+        let Self(
+            [
+                Point([_, y0]),
+                Point([_, y1]),
+                Point([_, y2]),
+                Point([_, y3]),
+            ],
+        ) = *self;
         let a = -y0 + 3.0 * y1 - 3.0 * y2 + y3;
         let b = 3.0 * y0 - 6.0 * y1 + 3.0 * y2;
         let c = -3.0 * y0 + 3.0 * y1;