diff --git a/apps/cadcraft-cli/src/main.rs b/apps/cadcraft-cli/src/main.rs index 661bba7..88e2446 100644 --- a/apps/cadcraft-cli/src/main.rs +++ b/apps/cadcraft-cli/src/main.rs @@ -705,7 +705,6 @@ mod tests { let _ = std::fs::remove_dir_all(&dir); } - fn args(values: &[&str]) -> Vec { values.iter().map(|value| (*value).into()).collect() } diff --git a/crates/engine/src/cmd/inquiry.rs b/crates/engine/src/cmd/inquiry.rs index a2e2c0a..e9550ca 100644 --- a/crates/engine/src/cmd/inquiry.rs +++ b/crates/engine/src/cmd/inquiry.rs @@ -199,9 +199,8 @@ fn run_area(s: &mut Session, p: &Value) -> Result { let mut total = (0.0, 0.0); for (i, g) in geoms.iter().enumerate() { let probe = polys.get(i).and_then(|p| p.first().copied()); - let depth = probe.map_or(0, |pt| { - polys.iter().enumerate().filter(|(j, q)| *j != i && cadcraft_geom::point_in_polygon(q, pt)).count() - }); + let depth = + probe.map_or(0, |pt| polys.iter().enumerate().filter(|(j, q)| *j != i && cadcraft_geom::point_in_polygon(q, pt)).count()); total.0 += if depth % 2 == 0 { g.area().abs() } else { -g.area().abs() }; total.1 += g.len(); } diff --git a/crates/io/src/tests.rs b/crates/io/src/tests.rs index 96ffced..1daba59 100644 --- a/crates/io/src/tests.rs +++ b/crates/io/src/tests.rs @@ -1265,11 +1265,8 @@ fn attdef_prompt_survives_dxf_roundtrip() { d.add(&Space::Model, Default::default(), attdef("Enter value")).unwrap(); d.add(&Space::Model, Default::default(), attdef("")).unwrap(); let back = roundtrip(&d); - let prompts: Vec<&str> = back - .model - .iter() - .filter_map(|e| if let EntityKind::AttDef(a) = &e.kind { Some(a.prompt.as_str()) } else { None }) - .collect(); + let prompts: Vec<&str> = + back.model.iter().filter_map(|e| if let EntityKind::AttDef(a) = &e.kind { Some(a.prompt.as_str()) } else { None }).collect(); assert_eq!(prompts, vec!["Enter value", ""]); } @@ -1309,7 +1306,7 @@ fn arc_length_dimension_keeps_its_kind_and_centre_on_roundtrip() { } // And through DWG. let dwg = cadcraft_dwg::dxf_to_dwg(text.as_bytes()).unwrap(); - let back = read_dxf(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap().as_bytes()).unwrap(); + let back = read_dxf(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap(); let dims: Vec<_> = back.model.iter().filter_map(|e| if let EntityKind::Dimension(x) = &e.kind { Some(x.clone()) } else { None }).collect(); assert_eq!(dims.len(), 1); assert!(matches!(dims[0].kind, DimKind::ArcLength), "{:?}", dims[0].kind);