Merge branch 'main' into update

# Conflicts:
#	Cargo.lock

Author: LaurenzV

Cargo.lock

@@ -12,4 +12,4 @@ path = "main.rs"
 [dependencies]
 phf = "0.7.22"
 phf_codegen = "0.7.22"
-itertools = "0.7"
+itertools = "0.14"

crates/usvg/codegen/Cargo.toml

@@ -931,29 +931,19 @@ fn convert_path(
         None => return,
     };
 
-    match raw_paint_order.order {
-        [PaintOrderKind::Markers, _, _] => {
-            if let Some(markers_node) = marker {
-                parent.children.push(Node::Group(Box::new(markers_node)));
-            }
-
+    match (raw_paint_order.order, marker) {
+        ([PaintOrderKind::Markers, _, _], Some(markers_node)) => {
+            parent.children.push(Node::Group(Box::new(markers_node)));
             parent.children.push(Node::Path(Box::new(path.clone())));
         }
-        [first, PaintOrderKind::Markers, last] => {
+        ([first, PaintOrderKind::Markers, last], Some(markers_node)) => {
             append_single_paint_path(first, &path, parent);
-
-            if let Some(markers_node) = marker {
-                parent.children.push(Node::Group(Box::new(markers_node)));
-            }
-
+            parent.children.push(Node::Group(Box::new(markers_node)));
             append_single_paint_path(last, &path, parent);
         }
-        [_, _, PaintOrderKind::Markers] => {
+        ([_, _, PaintOrderKind::Markers], Some(markers_node)) => {
             parent.children.push(Node::Path(Box::new(path.clone())));
-
-            if let Some(markers_node) = marker {
-                parent.children.push(Node::Group(Box::new(markers_node)));
-            }
+            parent.children.push(Node::Group(Box::new(markers_node)));
         }
         _ => parent.children.push(Node::Path(Box::new(path.clone()))),
     }

crates/usvg/src/parser/converter.rs

@@ -203,3 +203,8 @@ fn preserve_text_with_complex_text_decoration() {
 fn preserve_text_with_nested_baseline_shift() {
     resave_with_text("preserve-text-with-nested-baseline-shift");
 }
+
+#[test]
+fn optimize_paths_without_markers() {
+    resave("optimize-paths-without-markers");
+}