Update to 2024 edition

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Sameer Puri <crates@purisa.me>"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/sameer/svg2gcode"
 license = "MIT"
 

cli/src/main.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use g_code::{
-    emit::{format_gcode_io, FormatOptions},
+    emit::{FormatOptions, format_gcode_io},
     parse::snippet_parser,
 };
 use log::{error, info};
@@ -14,7 +14,7 @@ use std::{
 use svgtypes::LengthListParser;
 
 use svg2gcode::{
-    svg2program, ConversionOptions, Machine, Settings, SupportedFunctionality, Version,
+    ConversionOptions, Machine, Settings, SupportedFunctionality, Version, svg2program,
 };
 
 #[derive(Debug, Parser)]
@@ -95,7 +95,8 @@ struct Opt {
 
 fn main() -> io::Result<()> {
     if env::var("RUST_LOG").is_err() {
-        env::set_var("RUST_LOG", "svg2gcode=info")
+        // SAFETY: calling in a single-threaded context
+        unsafe { env::set_var("RUST_LOG", "svg2gcode=info") }
     }
     env_logger::init();
 
@@ -266,8 +267,12 @@ fn main() -> io::Result<()> {
             .transpose(),
     ];
 
-    let machine = if let [Ok(tool_on_action), Ok(tool_off_action), Ok(program_begin_sequence), Ok(program_end_sequence)] =
-        snippets
+    let machine = if let [
+        Ok(tool_on_action),
+        Ok(tool_off_action),
+        Ok(program_begin_sequence),
+        Ok(program_end_sequence),
+    ] = snippets
     {
         Machine::new(
             settings.machine.supported_functionality,

lib/src/arc.rs

@@ -278,7 +278,7 @@ impl<S: Scalar> Transformed<S> for SvgArc<S> {
 #[cfg(test)]
 mod tests {
     use cairo::{Context, SvgSurface};
-    use lyon_geom::{point, vector, CubicBezierSegment, Point, Vector};
+    use lyon_geom::{CubicBezierSegment, Point, Vector, point, vector};
     use std::path::PathBuf;
     use svgtypes::PathParser;
 

lib/src/converter/length_serde.rs

@@ -2,9 +2,9 @@
 //! used for [super::ConversionOptions::dimensions]
 
 use serde::{
+    Deserialize, Deserializer, Serialize, Serializer,
     de::{SeqAccess, Visitor},
     ser::SerializeSeq,
-    Deserialize, Deserializer, Serialize, Serializer,
 };
 use svgtypes::{Length, LengthUnit};
 

lib/src/converter/mod.rs

@@ -10,7 +10,7 @@ use uom::si::f64::Length as UomLength;
 use uom::si::length::{inch, millimeter};
 
 use self::units::CSS_DEFAULT_DPI;
-use crate::{turtle::*, Machine};
+use crate::{Machine, turtle::*};
 
 #[cfg(feature = "serde")]
 mod length_serde;

lib/src/converter/path.rs

@@ -1,6 +1,6 @@
 use euclid::Angle;
 use log::debug;
-use lyon_geom::{point, vector, ArcFlags};
+use lyon_geom::{ArcFlags, point, vector};
 use svgtypes::PathSegment;
 
 use crate::Turtle;

lib/src/converter/transform.rs

@@ -1,6 +1,6 @@
 use euclid::{
-    default::{Transform2D, Transform3D},
     Angle,
+    default::{Transform2D, Transform3D},
 };
 use lyon_geom::vector;
 use svgtypes::{Align, AspectRatio, TransformListToken, ViewBox};

lib/src/converter/visit.rs

@@ -6,12 +6,12 @@ use roxmltree::{Document, Node};
 use svgtypes::{AspectRatio, PathParser, PathSegment, PointsParser, TransformListParser, ViewBox};
 
 use super::{
+    ConversionVisitor,
     path::apply_path,
     transform::{get_viewport_transform, svg_transform_into_euclid_transform},
     units::DimensionHint,
-    ConversionVisitor,
 };
-use crate::{converter::node_name, Turtle};
+use crate::{Turtle, converter::node_name};
 
 const SVG_TAG_NAME: &str = "svg";
 const CLIP_PATH_TAG_NAME: &str = "clipPath";

lib/src/lib.rs

@@ -11,7 +11,7 @@ mod postprocess;
 /// This concept is referred to as [Turtle graphics](https://en.wikipedia.org/wiki/Turtle_graphics).
 mod turtle;
 
-pub use converter::{svg2program, ConversionConfig, ConversionOptions};
+pub use converter::{ConversionConfig, ConversionOptions, svg2program};
 pub use machine::{Machine, MachineConfig, SupportedFunctionality};
 pub use postprocess::PostprocessConfig;
 pub use turtle::Turtle;

lib/src/turtle/dpi.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use lyon_geom::{point, vector, CubicBezierSegment, Point, QuadraticBezierSegment, SvgArc, Vector};
+use lyon_geom::{CubicBezierSegment, Point, QuadraticBezierSegment, SvgArc, Vector, point, vector};
 use uom::si::{
     f64::Length,
     length::{inch, millimeter},

lib/src/turtle/mod.rs

@@ -1,8 +1,9 @@
 use std::fmt::Debug;
 
 use lyon_geom::{
-    euclid::{default::Transform2D, Angle},
-    point, vector, ArcFlags, CubicBezierSegment, Point, QuadraticBezierSegment, SvgArc, Vector,
+    ArcFlags, CubicBezierSegment, Point, QuadraticBezierSegment, SvgArc, Vector,
+    euclid::{Angle, default::Transform2D},
+    point, vector,
 };
 
 use crate::arc::Transformed;

web/src/forms/editors.rs

@@ -1,4 +1,4 @@
-use codespan_reporting::term::{emit, termcolor::NoColor, Config};
+use codespan_reporting::term::{Config, emit, termcolor::NoColor};
 use g_code::parse::{into_diagnostic, snippet_parser};
 use gloo_timers::callback::Timeout;
 use paste::paste;

web/src/forms/mod.rs

@@ -1,5 +1,5 @@
 use gloo_file::{
-    callbacks::{read_as_bytes, FileReader},
+    callbacks::{FileReader, read_as_bytes},
     futures::read_as_text,
 };
 use js_sys::TypeError;
@@ -8,7 +8,7 @@ use std::{convert::TryInto, path::Path};
 use svg2gcode::{Settings, Version};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::JsFuture;
-use web_sys::{window, Event, FileList, HtmlElement, HtmlInputElement, Response};
+use web_sys::{Event, FileList, HtmlElement, HtmlInputElement, Response, window};
 use yew::prelude::*;
 use yewdux::{functional::use_store, use_dispatch};
 

web/src/main.rs

@@ -5,13 +5,13 @@ use std::{
 
 use base64::Engine;
 use g_code::{
-    emit::{format_gcode_fmt, format_gcode_io, FormatOptions},
+    emit::{FormatOptions, format_gcode_fmt, format_gcode_io},
     parse::snippet_parser,
 };
 use js_sys::Date;
 use log::Level;
 use roxmltree::{Document, ParsingOptions};
-use svg2gcode::{svg2program, ConversionOptions, Machine};
+use svg2gcode::{ConversionOptions, Machine, svg2program};
 use yew::prelude::*;
 
 mod forms;
@@ -23,8 +23,8 @@ use forms::*;
 use state::*;
 use ui::*;
 use util::*;
-use yewdux::{prelude::use_store, use_dispatch, YewduxRoot};
-use zip::{write::FileOptions, CompressionMethod, ZipWriter};
+use yewdux::{YewduxRoot, prelude::use_store, use_dispatch};
+use zip::{CompressionMethod, ZipWriter, write::FileOptions};
 
 #[function_component(App)]
 fn app() -> Html {

web/src/ui/mod.rs

@@ -1,9 +1,9 @@
 use std::fmt::Display;
 use web_sys::{Event, FileList, HtmlInputElement, InputEvent, InputEventInit, MouseEvent};
 use yew::{
-    classes, function_component, html, use_force_update, use_node_ref, use_state,
+    AttrValue, Callback, Children, Html, NodeRef, Properties, TargetCast, ToHtml, classes,
+    function_component, html, use_force_update, use_node_ref, use_state,
     virtual_dom::{VChild, VNode},
-    AttrValue, Callback, Children, Html, NodeRef, Properties, TargetCast, ToHtml,
 };
 
 macro_rules! css_class_enum {
@@ -151,7 +151,7 @@ where
                 { props.button.clone().map(Html::from).unwrap_or_default() }
             </div>
             {
-                if let Some(Err(ref err)) = props.parsed.as_ref() {
+                if let Some(Err(err)) = props.parsed.as_ref() {
                     html!{ <pre class="form-input-hint">{ err.to_string() }</pre> }
                 } else if let Some(desc) = props.desc {
                     html! { <p class="form-input-hint">{ desc }</p> }
@@ -249,7 +249,7 @@ where
                 { props.button.clone().map(Html::from).unwrap_or_default() }
             </div>
             {
-                if let Some(Err(ref err)) = props.parsed.as_ref() {
+                if let Some(Err(err)) = props.parsed.as_ref() {
                     html!{ <pre class="form-input-hint">{ err }</pre> }
                 } else if let Some(desc) = props.desc {
                     html! { <p class="form-input-hint">{ desc }</p> }
@@ -433,7 +433,7 @@ where
                 }
             </div>
             {
-                if let Some(Err(ref err)) = props.parsed.as_ref() {
+                if let Some(Err(err)) = props.parsed.as_ref() {
                     html!{ <pre class="form-input-hint">{ err }</pre> }
                 } else if let Some(desc) = props.desc {
                     html! { <p class="form-input-hint">{ desc }</p> }

web/src/util.rs

@@ -1,7 +1,7 @@
 use base64::Engine;
 use std::path::Path;
 use wasm_bindgen::JsCast;
-use web_sys::{window, HtmlElement};
+use web_sys::{HtmlElement, window};
 
 pub fn prompt_download(path: impl AsRef<Path>, content: impl AsRef<[u8]>) {
     let window = window().unwrap();