VectorCraft: An open-source, vector art tool written by scratch in pure Rust
style: cargo fmt on files moved without formatting
aionggf1d427762b7d
diff --git a/apps/vectorcraft/src/gpu/tests.rs b/apps/vectorcraft/src/gpu/tests.rsindex 8a473e664..906e35fb6 100644--- a/apps/vectorcraft/src/gpu/tests.rs+++ b/apps/vectorcraft/src/gpu/tests.rs@@ -512,12 +512,9 @@ fn panics_in_wgpu_egui_wgpu_and_naga_are_graphics_failures() {] {assert!(in_graphics_stack(file), "{file}");}- for file in [- "apps/vectorcraft/src/main.rs",- "/home/wgpu/vectorcraft/crates/ui-egui/src/lib.rs",- "egui-0.36.2/src/context.rs",- "winit-0.30.12/src/x.rs",- ] {+ for file in+ ["apps/vectorcraft/src/main.rs", "/home/wgpu/vectorcraft/crates/ui-egui/src/lib.rs", "egui-0.36.2/src/context.rs", "winit-0.30.12/src/x.rs"]+ {assert!(!in_graphics_stack(file), "{file}");}}@@ -541,8 +538,7 @@ fn a_normal_exit_or_another_failure_does_not_restart() {let startup = Startup::default();assert_eq!(finish(Ok(Ok(())), &startup), Ok(()));// No adapter was picked (none can show the window): the error is returned, nothing restarts.- let none =- eframe::Error::Wgpu(eframe::egui_wgpu::WgpuError::CustomNativeAdapterSelectionError("no graphics adapter can show the window".into()));+ let none = eframe::Error::Wgpu(eframe::egui_wgpu::WgpuError::CustomNativeAdapterSelectionError("no graphics adapter can show the window".into()));assert_eq!(finish(Ok(Err(none)), &startup),Err(format!("WGPU error: Adapter selection failed: no graphics adapter can show the window ({HELP})"))diff --git a/apps/vectorcraft/src/logging/tests.rs b/apps/vectorcraft/src/logging/tests.rsindex 818f6db77..a1b54b353 100644--- a/apps/vectorcraft/src/logging/tests.rs+++ b/apps/vectorcraft/src/logging/tests.rs@@ -255,9 +255,7 @@ fn records_from_many_threads_are_whole_lines() {let l = std::sync::Arc::clone(&logger);std::thread::spawn(move || {for i in 0..100 {- l.log(- &log::Record::builder().level(log::Level::Info).target("vectorcraft").args(format_args!("thread {t} record {i}")).build(),- );+ l.log(&log::Record::builder().level(log::Level::Info).target("vectorcraft").args(format_args!("thread {t} record {i}")).build());}})})diff --git a/crates/color/src/gradient/tests.rs b/crates/color/src/gradient/tests.rsindex 495980e05..19e9f44fc 100644--- a/crates/color/src/gradient/tests.rs+++ b/crates/color/src/gradient/tests.rs@@ -16,13 +16,7 @@ fn increasing_samples_match_single_samples() {let stop = |offset: f32, hex: &str, midpoint: f32| GradientStop { midpoint, ..GradientStop::new(offset, Color::from_hex(hex).unwrap()) };let g = Gradient::new(GradientKind::Linear,- vec![- stop(0.1, "#ff0000", 0.3),- stop(0.4, "#00ff00", 0.7),- stop(0.4, "#0000ff", 0.5),- stop(0.2, "#ffff00", 0.5),- stop(0.9, "#000000", 0.5),- ],+ vec![stop(0.1, "#ff0000", 0.3), stop(0.4, "#00ff00", 0.7), stop(0.4, "#0000ff", 0.5), stop(0.2, "#ffff00", 0.5), stop(0.9, "#000000", 0.5)],);let ts: Vec<f32> = (0..=40).map(|k| k as f32 / 40.0).collect();let one_by_one: Vec<_> = ts.iter().map(|&t| g.sample_with(t, Color::lerp_keep_model)).collect();diff --git a/crates/color/src/palette_io/tests.rs b/crates/color/src/palette_io/tests.rsindex 7bfd7623e..b0342d7a5 100644--- a/crates/color/src/palette_io/tests.rs+++ b/crates/color/src/palette_io/tests.rs@@ -136,8 +136,7 @@ fn gpl_writes_rgb_with_group_headers_and_reads_comments_and_headers() {assert_eq!(read("GIMP Palette\n1 2 3 x\n", "Fallback").unwrap().name, "Fallback");// Colors and groups share names; an unnamed group is "Color Group".let lib = read("GIMP Palette\n0 0 0 Black\n# Group: Black\n1 1 1 Black\n# Group:\n", "x").unwrap();- let groups: Vec<(&str, Vec<&str>)> =- lib.groups.iter().map(|g| (g.name.as_str(), g.swatches.iter().map(|w| w.name.as_str()).collect())).collect();+ let groups: Vec<(&str, Vec<&str>)> = lib.groups.iter().map(|g| (g.name.as_str(), g.swatches.iter().map(|w| w.name.as_str()).collect())).collect();assert_eq!(groups, [("Black 2", vec!["Black 3"]), ("Color Group", vec![])]);}@@ -299,8 +298,7 @@ fn ase_names_unnamed_and_repeated_entries_and_skips_other_blocks() {assert_eq!(lib.swatches[2].paint.color(), Some(Color::rgb(1.0, 0.0, 0.0)), "clamped, NaN read as 0");assert!(lib.swatches[2].global && !lib.swatches[4].global, "without a color type: process");// A group start ends the open group, and groups and colors share names.- let groups: Vec<(&str, Vec<&str>)> =- lib.groups.iter().map(|g| (g.name.as_str(), g.swatches.iter().map(|w| w.name.as_str()).collect())).collect();+ let groups: Vec<(&str, Vec<&str>)> = lib.groups.iter().map(|g| (g.name.as_str(), g.swatches.iter().map(|w| w.name.as_str()).collect())).collect();assert_eq!(groups, [("Color Group", vec![]), ("Red 3", vec!["Red 4"])]);assert_eq!(lib.groups[1].swatches[0].paint.color(), Some(Color::gray(0.0)), "gray level 1 is white");}diff --git a/crates/doc/src/hit/tests.rs b/crates/doc/src/hit/tests.rsindex 743eeed7e..43db8ee16 100644--- a/crates/doc/src/hit/tests.rs+++ b/crates/doc/src/hit/tests.rs@@ -552,8 +552,7 @@ world",fn objects_at_lists_the_stack() {let mut d = Document::new(200.0, 200.0);let l = d.layers[0].id;- let rect =- |d: &mut Document, x: f64| Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::default_art());+ let rect = |d: &mut Document, x: f64| Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::default_art());let a = rect(&mut d, 0.0);let (b, c) = (rect(&mut d, 10.0), rect(&mut d, 20.0));let (a_id, b_id, c_id, g) = (a.id, b.id, c.id, d.alloc_id());@@ -702,8 +701,7 @@ fn objects_at_finds_symbol_instances_by_their_art() {let art = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(100.0, 60.0, 140.0, 80.0)), Appearance::default_art());d.symbols.push(crate::Symbol { name: "Far".into(), art: Arc::new(art) });let (layer, top, inner, group) = (d.layers[0].id, d.alloc_id(), d.alloc_id(), d.alloc_id());- let instance =- |id, dy: f64| Node::new(id, NodeKind::SymbolInstance { symbol: "Far".into(), xf: vectorcraft_geom::Affine::translate((0.0, dy)) });+ let instance = |id, dy: f64| Node::new(id, NodeKind::SymbolInstance { symbol: "Far".into(), xf: vectorcraft_geom::Affine::translate((0.0, dy)) });d.insert(Some(layer), 0, instance(top, 0.0)).unwrap();d.insert(Some(layer), 1, Node::group(group, vec![Arc::new(instance(inner, 100.0))])).unwrap();let opt = HitOptions::default();@@ -768,8 +766,7 @@ fn insert_locked(d: &mut Document, parent: NodeId, mut n: Node) -> NodeId {fn locked_objects_at_lists_the_locked_stack() {let mut d = Document::new(200.0, 200.0);let l = d.layers[0].id;- let rect =- |d: &mut Document, x: f64| Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::default_art());+ let rect = |d: &mut Document, x: f64| Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::default_art());let (a, b) = (rect(&mut d, 0.0), rect(&mut d, 10.0));let (a, b) = (insert_locked(&mut d, l, a), insert_locked(&mut d, l, b));let (mut inner, locked_group) = (rect(&mut d, 20.0), d.alloc_id());diff --git a/crates/doc/src/node/tests.rs b/crates/doc/src/node/tests.rsindex 32ff35e6a..3e7a399f2 100644--- a/crates/doc/src/node/tests.rs+++ b/crates/doc/src/node/tests.rs@@ -112,8 +112,7 @@ fn corner_kinds_save_only_when_some_corner_isnt_round() {assert_eq!(json["kinds"], serde_json::json!(["round", "chamfer", "round", "round"]));assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), l);// Polygons saved before Live Corners cut theirs read as sharp; a live path round-trips.- let p: LiveShape =- serde_json::from_value(serde_json::json!({"shape": "polygon", "radius": 10.0, "sides": 5, "xf": [1, 0, 0, 1, 0, 0]})).unwrap();+ let p: LiveShape = serde_json::from_value(serde_json::json!({"shape": "polygon", "radius": 10.0, "sides": 5, "xf": [1, 0, 0, 1, 0, 0]})).unwrap();assert_eq!(p, LiveShape::Polygon { radius: 10.0, sides: 5, xf: Affine::IDENTITY, radii: vec![], kinds: vec![], radii_relative: false });let star = shapes::star(Point::new(0.0, 0.0), 20.0, 10.0, 5, 0.0);let path = LiveShape::Path { base: star, radii: vec![2.0; 10], kinds: vec![], radii_relative: false };@@ -395,8 +394,7 @@ fn type_visual_bounds_grow_with_the_character_stroke() {/// A group holding a path, a compound, an image and a nested group, as a file writes it.fn nested_group() -> Node {let path = |id| Node::path(NodeId(id), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::default_art());- let image =- ImageObject { key: "k".into(), width: 2, height: 3, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };+ let image = ImageObject { key: "k".into(), width: 2, height: 3, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };let inner = Node::new(NodeId(5), NodeKind::Group { children: vec![Arc::new(path(6))], clip: true });let compound = Node::new(NodeId(3), NodeKind::Compound { children: vec![Arc::new(path(4))], rule: FillRule::EvenOdd });let kids = vec![Arc::new(path(2)), Arc::new(compound), Arc::new(Node::new(NodeId(7), NodeKind::Image(Box::new(image)))), Arc::new(inner)];@@ -417,10 +415,7 @@ fn kinds_read_back_with_type_first_or_anywhere() {let kind = r#"{"children":[],"x":{"deep":[1,2]},"clip":true,"type":"group"}"#;assert_eq!(serde_json::from_str::<NodeKind>(kind).unwrap(), NodeKind::Group { children: vec![], clip: true });let kind = r#"{"symbol":"S","type":"symbolinstance","later":1,"xf":[1,0,0,1,5,6]}"#;- assert_eq!(- serde_json::from_str::<NodeKind>(kind).unwrap(),- NodeKind::SymbolInstance { symbol: "S".into(), xf: Affine::translate((5.0, 6.0)) }- );+ assert_eq!(serde_json::from_str::<NodeKind>(kind).unwrap(), NodeKind::SymbolInstance { symbol: "S".into(), xf: Affine::translate((5.0, 6.0)) });let kind = r#"{"width":2,"type":"image","key":"k","height":3,"xf":[1,0,0,1,0,0]}"#;assert!(matches!(serde_json::from_str::<NodeKind>(kind).unwrap(), NodeKind::Image(i) if i.key == "k" && i.height == 3));// Defaults as before.diff --git a/crates/doc/src/tests.rs b/crates/doc/src/tests.rsindex 6ef4260a9..a13fb2168 100644--- a/crates/doc/src/tests.rs+++ b/crates/doc/src/tests.rs@@ -179,8 +179,7 @@ fn art_on_a_locked_artboard_cannot_be_selected_or_edited() {let (sub, s1, s2) = (d.alloc_id(), d.alloc_id(), d.alloc_id());d.insert(Some(layer), usize::MAX, Node::layer(sub, "Sub", LayerColor::Preset(2))).unwrap();for (id, x, y) in [(s1, 300.0, 300.0), (s2, 800.0, 100.0)] {- d.insert(Some(sub), usize::MAX, Node::path(id, shapes::rectangle(Rect::new(x, y, x + 10.0, y + 10.0)), Appearance::default_art()))- .unwrap();+ d.insert(Some(sub), usize::MAX, Node::path(id, shapes::rectangle(Rect::new(x, y, x + 10.0, y + 10.0)), Appearance::default_art())).unwrap();}assert_eq!((top(&d, 305.0, 305.0), top(&d, 805.0, 105.0)), (Some(s1), None));assert!(!d.on_locked_artboard(sub));@@ -378,11 +377,8 @@ fn setup_round_trips_and_old_files_load() {#[test]fn char_position_round_trips() {- let st = CharStyle {- position: CharPosition::Subscript(ScriptMetrics { size: 50.0, position: 20.0 }),- small_caps: Some(75.0),- ..CharStyle::default()- };+ let st =+ CharStyle { position: CharPosition::Subscript(ScriptMetrics { size: 50.0, position: 20.0 }), small_caps: Some(75.0), ..CharStyle::default() };let v = serde_json::to_value(&st).unwrap();assert_eq!(v["position"], serde_json::json!({"kind": "subscript", "size": 50.0, "position": 20.0}));assert_eq!(serde_json::from_value::<CharStyle>(v).unwrap(), st);diff --git a/crates/effects/src/group/tests.rs b/crates/effects/src/group/tests.rsindex 9f7199a12..c3bf4bfe3 100644--- a/crates/effects/src/group/tests.rs+++ b/crates/effects/src/group/tests.rs@@ -13,11 +13,7 @@ fn skip_without_craft_fonts() -> bool {}fn sq(id: u64, x: f64, color: Color) -> Arc<Node> {- Arc::new(Node::path(- NodeId(id),- shapes::rectangle(Rect::new(x, 0.0, x + 10.0, 10.0)),- Appearance::basic(Paint::solid(color), Paint::None, 0.0),- ))+ Arc::new(Node::path(NodeId(id), shapes::rectangle(Rect::new(x, 0.0, x + 10.0, 10.0)), Appearance::basic(Paint::solid(color), Paint::None, 0.0)))}fn group_with(effect: &str) -> Node {@@ -271,8 +267,7 @@ fn a_transform_on_a_group_paints_each_copy_with_its_own_gradient() {let geom = GradientGeom { start: (0.0, 5.0).into(), end: (10.0, 5.0).into(), aspect: 1.0, focal: None };let paints = [Paint::Gradient(Box::new(ramp.clone())), Paint::Gradient(Box::new(GradientPaint { geom: Some(geom), ..ramp }))];for (k, paint) in paints.into_iter().enumerate() {- let square =- Arc::new(Node::path(NodeId(1), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::basic(paint, Paint::None, 0.0)));+ let square = Arc::new(Node::path(NodeId(1), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::basic(paint, Paint::None, 0.0)));let mut g = Node::group(NodeId(10), vec![square]);let params = serde_json::json!({"moveH": 30, "copies": 2});g.appearance.effects.push(Effect { id: "distort.transform".into(), params, visible: true });diff --git a/crates/engine/src/cmd/effectcmd/tests.rs b/crates/engine/src/cmd/effectcmd/tests.rsindex a2b8a1490..c23c578d0 100644--- a/crates/engine/src/cmd/effectcmd/tests.rs+++ b/crates/engine/src/cmd/effectcmd/tests.rs@@ -95,11 +95,7 @@ fn an_earlier_perspective_strength_is_set_as_its_angle() {let angle_of = |pct: f64| effects::merged_params(effects::EXTRUDE, &json!({"perspective": pct}))["perspectiveAngle"].as_f64().unwrap();let angle = angle_of(60.0);assert!((angle - 30.12).abs() < 0.01, "{angle}");- assert!(- params(&s).get("perspective").is_none() && (params(&s)["perspectiveAngle"].as_f64().unwrap() - angle).abs() < 1e-12,- "{}",- params(&s)- );+ assert!(params(&s).get("perspective").is_none() && (params(&s)["perspectiveAngle"].as_f64().unwrap() - angle).abs() < 1e-12, "{}", params(&s));s.execute("effect.setParams", &json!({"index": 0, "params": {"perspective": 100}, "ids": [id.0], "item": null})).unwrap();assert!((params(&s)["perspectiveAngle"].as_f64().unwrap() - angle_of(100.0)).abs() < 1e-12);// A file of then: the strength stored; setting an angle replaces it.@@ -114,11 +110,8 @@ fn an_earlier_perspective_strength_is_set_as_its_angle() {#[test]fn an_earlier_light_direction_is_set_as_rotation_and_height() {let (mut s, id) = session_with_rect();- s.execute(- "effect.apply",- &json!({"effect": effects::ROTATE, "ids": [id.0], "item": null, "params": {"lightAzimuth": 180, "lightElevation": 0}}),- )- .unwrap();+ s.execute("effect.apply", &json!({"effect": effects::ROTATE, "ids": [id.0], "item": null, "params": {"lightAzimuth": 180, "lightElevation": 0}}))+ .unwrap();let params = |s: &Session| node(s, id).appearance.effects[0].params.clone();// Straight from behind the object, level with it.assert!(params(&s).get("lightAzimuth").is_none() && params(&s).get("lightElevation").is_none(), "{}", params(&s));diff --git a/crates/engine/src/cmd/graph/tests.rs b/crates/engine/src/cmd/graph/tests.rsindex e6d33bfaa..36c9589cd 100644--- a/crates/engine/src/cmd/graph/tests.rs+++ b/crates/engine/src/cmd/graph/tests.rs@@ -17,9 +17,7 @@ fn fmt_value_does_not_saturate_beyond_i64() {fn graph(s: &mut Session, ty: &str) -> NodeId {let csv = ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,-1,6";NodeId(- s.execute("graph.create", &json!({"type": ty, "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"]- .as_u64()- .unwrap(),+ s.execute("graph.create", &json!({"type": ty, "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"].as_u64().unwrap(),)}@@ -326,11 +324,7 @@ fn painting_a_line_series_stroke_sets_its_persistent_colour() {assert!(s.doc().unwrap().doc.node(id).unwrap().extras().graph.as_ref().unwrap().series_paints[0].fill.is_none());s.execute("graph.setData", &json!({"rows": [[1, 2], [3, 4]]})).unwrap();assert!(- group(s.doc().unwrap().doc.node(id).unwrap(), "2024")- .children()- .unwrap()- .iter()- .any(|n| n.appearance.stroke_paint().color() == Some(blue))+ group(s.doc().unwrap().doc.node(id).unwrap(), "2024").children().unwrap().iter().any(|n| n.appearance.stroke_paint().color() == Some(blue)));}@@ -539,8 +533,7 @@ fn a_row_with_an_empty_label_keeps_its_values_in_place() {fn blanks_read_back_as_null_and_year_header_rows_still_read_as_headers() {let mut s = Session::new();s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();- let r =- s.execute("graph.create", &json!({"type": "line", "x": 0, "y": 0, "width": 300, "height": 200, "rows": [[1, null], [2, 3]]})).unwrap();+ let r = s.execute("graph.create", &json!({"type": "line", "x": 0, "y": 0, "width": 300, "height": 200, "rows": [[1, null], [2, 3]]})).unwrap();let id = NodeId(r["id"].as_u64().unwrap());assert_eq!(s.execute("graph.setData", &json!({"id": id.0})).unwrap()["rows"], json!([[1.0, null], [2.0, 3.0]]));// A label followed by empty cells is a header with no series names, as before blanks existed.@@ -560,8 +553,7 @@ fn a_huge_ragged_grid_is_capped() {fn a_label_only_row_stays_with_blank_values() {let mut s = Session::new();s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();- let r =- s.execute("graph.create", &json!({"type": "column", "x": 0, "y": 0, "width": 300, "height": 200, "csv": ",a\nQ1,1\nQ2\nQ3,3"})).unwrap();+ let r = s.execute("graph.create", &json!({"type": "column", "x": 0, "y": 0, "width": 300, "height": 200, "csv": ",a\nQ1,1\nQ2\nQ3,3"})).unwrap();let id = NodeId(r["id"].as_u64().unwrap());let spec = s.doc().unwrap().doc.node(id).unwrap().extras().graph.clone().unwrap();assert_eq!(spec.categories, vec!["Q1", "Q2", "Q3"]);@@ -743,9 +735,7 @@ fn bar_graphs_take_stacked_bar_series() {s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();let csv = ",a,b,c\nQ1,10,20,-5\nQ2,10,20,-5";let id = NodeId(- s.execute("graph.create", &json!({"type": "bar", "x": 0, "y": 0, "width": 300, "height": 200, "csv": csv})).unwrap()["id"]- .as_u64()- .unwrap(),+ s.execute("graph.create", &json!({"type": "bar", "x": 0, "y": 0, "width": 300, "height": 200, "csv": csv})).unwrap()["id"].as_u64().unwrap(),);assert!(s.execute("graph.setType", &json!({"seriesIndexes": [1], "type": "column"})).is_err());s.execute("graph.setType", &json!({"seriesIndexes": [1, 2], "type": "stackedBar"})).unwrap();@@ -988,13 +978,7 @@ fn data_without_a_right_axis_series_drops_its_assignment() {/// Bounds of the straight lines in the Axes group.fn axis_lines(s: &Session, id: NodeId) -> Vec<vectorcraft_geom::Rect> {let n = s.doc().unwrap().doc.node(id).unwrap().clone();- group(&n, "Axes")- .children()- .unwrap()- .iter()- .filter(|c| matches!(c.kind, NodeKind::Path { .. }))- .filter_map(|c| c.geometric_bounds())- .collect()+ group(&n, "Axes").children().unwrap().iter().filter(|c| matches!(c.kind, NodeKind::Path { .. })).filter_map(|c| c.geometric_bounds()).collect()}fn axis_texts(s: &Session, id: NodeId) -> Vec<String> {@@ -1560,8 +1544,7 @@ fn a_repeating_column_design_stacks_a_copy_per_ten_and_chops_or_scales_the_last(assert!(near(copies[0], at(260.0, 300.0)) && near(copies[1], at(220.0, 260.0)) && near(copies[2], at(180.0, 220.0)), "{copies:?}");let NodeKind::Group { clip: true, children } = &parts[3].kind else { panic!("the last copy is clipped: {:?}", parts[3].kind) };assert!(near(frames(&parts[3])[0], at(140.0, 180.0)), "a whole copy");- let (clip, copy) =- (children[0].geometric_bounds().unwrap(), vectorcraft_render::painted_bounds(&s.doc().unwrap().doc, &children[1]).unwrap());+ let (clip, copy) = (children[0].geometric_bounds().unwrap(), vectorcraft_render::painted_bounds(&s.doc().unwrap().doc, &children[1]).unwrap());assert_eq!(clip.y0, 160.0, "cut off at the value");// Its sides and its foot, strokes included, are not cut.assert!(clip.x0 <= copy.x0 && clip.x1 >= copy.x1 && clip.y1 >= copy.y1 && copy.x0 < plain.x0, "{clip:?} {copy:?}");@@ -1580,13 +1563,8 @@ fn a_repeating_column_design_stacks_a_copy_per_ten_and_chops_or_scales_the_last(let art = vectorcraft_doc::Node::group(d.alloc_id(), vec![std::sync::Arc::new(frame), std::sync::Arc::new(inner)]);d.graph_designs.push(vectorcraft_doc::GraphDesign { name: "Brushed".into(), art: std::sync::Arc::new(art) });let options = ColumnDesign { design: "Brushed".into(), column_type: ColumnType::Repeating, ..ColumnDesign::default() };- let g = GraphSpec {- rows: vec![vec![35.0]],- axis_min: Some(0.0),- axis_max: Some(50.0),- series_columns: vec![Some(options)],- ..GraphSpec::default()- };+ let g =+ GraphSpec { rows: vec![vec![35.0]], axis_min: Some(0.0), axis_max: Some(50.0), series_columns: vec![Some(options)], ..GraphSpec::default() };let out = super::generate(&mut d, &g);let column = out.iter().find(|n| n.extras().series_index == Some(0)).unwrap().children().unwrap()[0].clone();let last = column.children().unwrap().last().unwrap().clone();@@ -1963,13 +1941,8 @@ fn a_repeating_design_shows_its_totals_once_at_the_value_end_and_a_sliding_one_blet art = vectorcraft_doc::Node::group(d.alloc_id(), vec![std::sync::Arc::new(frame), std::sync::Arc::new(total)]);d.graph_designs.push(vectorcraft_doc::GraphDesign { name: "Dotted".into(), art: std::sync::Arc::new(art) });let options = ColumnDesign { design: "Dotted".into(), ..ColumnDesign::default() };- let g = GraphSpec {- rows: vec![vec![35.0]],- axis_min: Some(0.0),- axis_max: Some(50.0),- series_columns: vec![Some(options)],- ..GraphSpec::default()- };+ let g =+ GraphSpec { rows: vec![vec![35.0]], axis_min: Some(0.0), axis_max: Some(50.0), series_columns: vec![Some(options)], ..GraphSpec::default() };let out = super::generate(&mut d, &g);let column = out.iter().find(|n| n.extras().series_index == Some(0)).unwrap().children().unwrap()[0].clone();let (text, at) = totals_of(&column.children().unwrap()[1..]).remove(0);@@ -2115,9 +2088,7 @@ fn totals_take_their_places_from_the_two_digits_after_the_percent_sign() {fn make(s: &mut Session, ty: &str, csv: &str) -> NodeId {NodeId(- s.execute("graph.create", &json!({"type": ty, "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"]- .as_u64()- .unwrap(),+ s.execute("graph.create", &json!({"type": ty, "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"].as_u64().unwrap(),)}@@ -2152,10 +2123,8 @@ fn a_bar_in_a_label_breaks_the_line() {let legend: Vec<_> = group(&n, "Legend").children().unwrap().iter().map(|c| (**c).clone()).collect();let NodeKind::Text(t) = &legend[0].kind else { panic!() };assert_eq!(t.plain_text(), "Total\nSales\n2023");- let (a, b) = (- series_parts(&s, id, 0).last().unwrap().geometric_bounds().unwrap(),- series_parts(&s, id, 1).last().unwrap().geometric_bounds().unwrap(),- );+ let (a, b) =+ (series_parts(&s, id, 0).last().unwrap().geometric_bounds().unwrap(), series_parts(&s, id, 1).last().unwrap().geometric_bounds().unwrap());assert!((b.y0 - a.y0 - 3.0 * 9.0 * 1.8).abs() < 1e-6, "{a:?} {b:?}");}@@ -2269,10 +2238,7 @@ fn legends_in_wedges_put_the_series_labels_inside_the_pie() {s.execute("document.save", &json!({"path": path})).unwrap();s.execute("document.open", &json!({"path": path})).unwrap();let g = spec(&s, id);- assert_eq!(- (g.pie_legend_in_wedges, g.pie_position, g.pie_sort),- (true, vectorcraft_doc::PiePosition::Stacked, vectorcraft_doc::PieSort::All)- );+ assert_eq!((g.pie_legend_in_wedges, g.pie_position, g.pie_sort), (true, vectorcraft_doc::PiePosition::Stacked, vectorcraft_doc::PieSort::All));let v = serde_json::to_value(GraphSpec::default()).unwrap();for k in ["pieLegendInWedges", "piePosition", "pieSort"] {assert!(v.get(k).is_none(), "{k}");@@ -2464,8 +2430,7 @@ fn the_legend_across_top_keeps_above_labels_over_the_plot() {s.execute("graph.setType", &json!({"legendAcrossTop": true})).unwrap();let n = s.doc().unwrap().doc.node(id).unwrap().clone();let axes_top = group(&n, "Axes").children().unwrap().iter().filter_map(|c| c.geometric_bounds()).map(|b| b.y0).fold(f64::MAX, f64::min);- let legend_bottom =- group(&n, "Legend").children().unwrap().iter().filter_map(|c| c.geometric_bounds()).map(|b| b.y1).fold(f64::MIN, f64::max);+ let legend_bottom = group(&n, "Legend").children().unwrap().iter().filter_map(|c| c.geometric_bounds()).map(|b| b.y1).fold(f64::MIN, f64::max);assert!(legend_bottom < axes_top, "{legend_bottom} above {axes_top}");// No legend: nothing across the top either.s.execute("graph.setType", &json!({"legend": false})).unwrap();diff --git a/crates/engine/src/cmd/typecmd/area_tests.rs b/crates/engine/src/cmd/typecmd/area_tests.rsindex 6b3e44960..a844d0083 100644--- a/crates/engine/src/cmd/typecmd/area_tests.rs+++ b/crates/engine/src/cmd/typecmd/area_tests.rs@@ -74,9 +74,8 @@ fn kinsoku_set_is_set_per_paragraph_and_saved_only_when_not_hard() {use vectorcraft_doc::Kinsoku;let mut s = Session::new();s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();- let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "あカッ", "area": {"width": 40, "height": 100}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id =+ s.execute("text.create", &json!({"x": 10, "y": 10, "text": "あカッ", "area": {"width": 40, "height": 100}})).unwrap()["id"].as_u64().unwrap();let para = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {NodeKind::Text(t) => t.para.clone(),_ => panic!("text"),@@ -195,9 +194,8 @@ fn system_layout_sets_the_document_and_every_text_object() {_ => panic!("text"),};let setup = |s: &Session| s.doc().unwrap().doc.setup.clone();- let advances = |s: &Session| {- vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &text(s, id)).glyphs.iter().map(|g| g.advance).collect::<Vec<_>>()- };+ let advances =+ |s: &Session| vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &text(s, id)).glyphs.iter().map(|g| g.advance).collect::<Vec<_>>();assert!(!setup(&s).system_layout);assert!(!text(&s, id).system_layout && !text(&s, other).system_layout);assert!(serde_json::to_value(setup(&s)).unwrap().get("systemLayout").is_none());@@ -409,10 +407,9 @@ fn bulleted_lists_are_set_per_paragraph_saved_and_continued() {use vectorcraft_doc::text::{Bullet, ParaList};let mut s = Session::new();s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();- let id =- s.execute("text.create", &json!({"x": 10, "y": 10, "text": "One\nTwo\nThree", "area": {"width": 300, "height": 200}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "One\nTwo\nThree", "area": {"width": 300, "height": 200}})).unwrap()["id"]+ .as_u64()+ .unwrap();let text = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {NodeKind::Text(t) => (**t).clone(),_ => panic!("text"),@@ -475,10 +472,9 @@ fn numbered_lists_are_set_per_paragraph_saved_and_styled() {use vectorcraft_doc::text::{Bullet, NumberStyle, ParaList};let mut s = Session::new();s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();- let id =- s.execute("text.create", &json!({"x": 10, "y": 10, "text": "One\nTwo\nThree", "area": {"width": 300, "height": 200}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "One\nTwo\nThree", "area": {"width": 300, "height": 200}})).unwrap()["id"]+ .as_u64()+ .unwrap();let text = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {NodeKind::Text(t) => (**t).clone(),_ => panic!("text"),@@ -637,10 +633,9 @@ fn convert_to_text_writes_the_markers_where_they_were_drawn() {// text to the next default stop, and 11 to its stop at 72 pt, whose leader the number's tab// draws neither before nor after.let items = (1..=11).map(|i| format!("Item {i}")).collect::<Vec<_>>().join("\n");- let id =- s.execute("text.create", &json!({"x": 300, "y": 10, "size": 20, "text": items, "area": {"width": 300, "height": 600}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id = s.execute("text.create", &json!({"x": 300, "y": 10, "size": 20, "text": items, "area": {"width": 300, "height": 600}})).unwrap()["id"]+ .as_u64()+ .unwrap();s.execute("text.setFormat", &json!({"ids": [id], "list": "number"})).unwrap();let eleven = 9 * 7 + 8;s.execute("text.tabs.set", &json!({"ids": [id], "start": eleven, "end": eleven, "stops": [{"position": 72, "leader": "."}]})).unwrap();@@ -669,9 +664,8 @@ fn convert_to_text_writes_the_markers_where_they_were_drawn() {("One ", 300, json!([{"position": 200, "align": "right"}]), vec![(200.0, right, String::new())]),("The quick brown fox jumps over the lazy dog", 230, json!([{"position": 100, "align": "right"}, {"position": 150}]), vec![]),] {- let id = s- .execute("text.create", &json!({"x": 10, "y": 600, "size": 30, "text": text_in, "area": {"width": width, "height": 300}}))- .unwrap()["id"]+ let id = s.execute("text.create", &json!({"x": 10, "y": 600, "size": 30, "text": text_in, "area": {"width": width, "height": 300}})).unwrap()+ ["id"].as_u64().unwrap();s.execute("text.setFormat", &json!({"ids": [id], "list": "number", "composer": "singleLine"})).unwrap();@@ -680,11 +674,7 @@ fn convert_to_text_writes_the_markers_where_they_were_drawn() {s.execute("text.convertListToText", &json!({"ids": [id]})).unwrap();assert_eq!(drawn_glyphs(&s, id), before, "{text_in:?}");let after = tabs(&s, id, 0);- assert_eq!(- (after.first().map(|t| (t.1, t.2.as_str())), after.get(1..).map(<[_]>::to_vec)),- (Some((left, "")), Some(kept)),- "{text_in:?}"- );+ assert_eq!((after.first().map(|t| (t.1, t.2.as_str())), after.get(1..).map(<[_]>::to_vec)), (Some((left, "")), Some(kept)), "{text_in:?}");}// Overset items, which the layout leaves out, get the stop by the same rule: a 30 pt number is// wider than the hanging indent, a 12 pt bullet is not.@@ -703,8 +693,7 @@ fn convert_to_text_writes_the_markers_where_they_were_drawn() {}// Point type and vertical type.for vertical in [false, true] {- let id =- s.execute("text.create", &json!({"x": 400, "y": 700, "vertical": vertical, "text": "One\nTwo"})).unwrap()["id"].as_u64().unwrap();+ let id = s.execute("text.create", &json!({"x": 400, "y": 700, "vertical": vertical, "text": "One\nTwo"})).unwrap()["id"].as_u64().unwrap();s.execute("text.setFormat", &json!({"ids": [id], "list": "number"})).unwrap();let before = drawn_glyphs(&s, id);s.execute("text.convertListToText", &json!({"ids": [id]})).unwrap();@@ -771,9 +760,8 @@ fn threaded_numbers_convert_to_text_as_the_story_counted_them() {vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t).markers.iter().map(|m| m.text.clone()).collect::<Vec<_>>()};let thread = |s: &mut Session, text: &str| {- let a = s.execute("text.create", &json!({"x": 10, "y": 10, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"]- .as_u64()- .unwrap();+ let a =+ s.execute("text.create", &json!({"x": 10, "y": 10, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();let b = s.execute("shape.rectangle", &json!({"x": 200, "y": 10, "width": 150, "height": 200})).unwrap()["id"].as_u64().unwrap();s.execute("select.set", &json!({"ids": [a, b]})).unwrap();s.execute("text.thread.create", &json!({})).unwrap();@@ -814,9 +802,8 @@ fn threaded_numbers_convert_to_text_as_the_story_counted_them() {assert!(second.para_at(0).list.is_none(), "the third paragraph's part in the second frame leaves the list too");// One item that fits in the first of three frames: the two empty frames after it leave the// list too, so the re-flowed thread draws no number before the converted one.- let a = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "Item", "area": {"width": 150, "height": 60}})).unwrap()["id"]- .as_u64()- .unwrap();+ let a =+ s.execute("text.create", &json!({"x": 10, "y": 10, "text": "Item", "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();let b = s.execute("shape.rectangle", &json!({"x": 200, "y": 10, "width": 150, "height": 60})).unwrap()["id"].as_u64().unwrap();let c = s.execute("shape.rectangle", &json!({"x": 400, "y": 10, "width": 150, "height": 60})).unwrap()["id"].as_u64().unwrap();s.execute("select.set", &json!({"ids": [a, b, c]})).unwrap();@@ -1049,9 +1036,8 @@ fn leading_model_is_set_per_paragraph_and_saved_only_when_top_to_top() {let mut s = Session::new();s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();// Exercise ink bounds with bundled glyphs; Japanese outlines require optional craft-fonts.- let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "A\nB", "area": {"width": 200, "height": 100}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id =+ s.execute("text.create", &json!({"x": 10, "y": 10, "text": "A\nB", "area": {"width": 200, "height": 100}})).unwrap()["id"].as_u64().unwrap();let text = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {NodeKind::Text(t) => (**t).clone(),_ => panic!("text"),@@ -1387,9 +1373,8 @@ fn area_options_columns_change_layout() {let mut s = Session::new();s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();let text = "word ".repeat(80);- let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": text, "area": {"width": 300, "height": 120}})).unwrap()["id"]- .as_u64()- .unwrap();+ let id =+ s.execute("text.create", &json!({"x": 10, "y": 10, "text": text, "area": {"width": 300, "height": 120}})).unwrap()["id"].as_u64().unwrap();s.execute("select.set", &json!({"ids": [id]})).unwrap();let q = s.execute("text.areaOptions", &json!({})).unwrap();assert_eq!((q["rows"].as_u64(), q["columns"].as_u64()), (Some(1), Some(1)));diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rsindex 5707e8913..8312ad56f 100644--- a/crates/engine/src/lib.rs+++ b/crates/engine/src/lib.rs@@ -2597,7 +2597,11 @@ pub(crate) fn adding_fonts() -> std::sync::MutexGuard<'static, ()> {}#[cfg(test)]-use tests::{adjust as tests_adjust, clip as tests_clip, colormgmt as tests_colormgmt, expand as tests_expand, large_edits as tests_large_edits, links as tests_links, linkspanel as tests_linkspanel, menucmds as tests_menucmds, outlinestroke as tests_outlinestroke, persp_select as tests_persp_select, textimport as tests_textimport};+use tests::{+ adjust as tests_adjust, clip as tests_clip, colormgmt as tests_colormgmt, expand as tests_expand, large_edits as tests_large_edits,+ links as tests_links, linkspanel as tests_linkspanel, menucmds as tests_menucmds, outlinestroke as tests_outlinestroke,+ persp_select as tests_persp_select, textimport as tests_textimport,+};#[cfg(test)]mod tests;diff --git a/crates/engine/src/tests/clipflavours.rs b/crates/engine/src/tests/clipflavours.rsindex 4751b7f6b..a72e87c1c 100644--- a/crates/engine/src/tests/clipflavours.rs+++ b/crates/engine/src/tests/clipflavours.rs@@ -6,8 +6,8 @@ use vectorcraft_doc::{NodeKind, TextObject};use vectorcraft_geom::Point;use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};-use crate::*;use crate::cmd::clipboard::{AI, BITMAP, EPS, FILE_HEAD, PASTE_ORDER, PDF, PNG, SVG, TEXT, file_flavour};+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/cmdsplit.rs b/crates/engine/src/tests/cmdsplit.rsindex 8c58d76c5..af94ea3f3 100644--- a/crates/engine/src/tests/cmdsplit.rs+++ b/crates/engine/src/tests/cmdsplit.rs@@ -3,8 +3,8 @@use serde_json::json;-use crate::*;use crate::cmd::{leaf_targets, paint_targets, unique_name};+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/draw2.rs b/crates/engine/src/tests/draw2.rsindex 7577991af..5cefe68f3 100644--- a/crates/engine/src/tests/draw2.rs+++ b/crates/engine/src/tests/draw2.rs@@ -5,8 +5,8 @@ use vectorcraft_doc::{NodeId, NodeKind};use vectorcraft_geom::{FillRule, PathData, Point};use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};-use crate::*;use crate::tooling::{UiRequest, ViewInfo};+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/editcolors.rs b/crates/engine/src/tests/editcolors.rsindex 680fa4217..d17ded2a7 100644--- a/crates/engine/src/tests/editcolors.rs+++ b/crates/engine/src/tests/editcolors.rs@@ -5,8 +5,8 @@ use vectorcraft_color::{Color, Paint};use vectorcraft_doc::Node;use vectorcraft_tools::{PointerEvent, PointerKind};-use crate::*;use crate::tooling::ViewInfo;+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/flatpresets.rs b/crates/engine/src/tests/flatpresets.rsindex 2c73887be..3eef893bb 100644--- a/crates/engine/src/tests/flatpresets.rs+++ b/crates/engine/src/tests/flatpresets.rs@@ -4,8 +4,8 @@use serde_json::{Value, json};-use crate::*;use crate::cmd::{FlattenOptions, FlattenerPreset};+use crate::*;fn run(s: &mut Session, id: &str, p: Value) -> Value {s.execute(id, &p).unwrap()diff --git a/crates/engine/src/tests/flatpreview.rs b/crates/engine/src/tests/flatpreview.rsindex 5ea702ee1..9487da133 100644--- a/crates/engine/src/tests/flatpreview.rs+++ b/crates/engine/src/tests/flatpreview.rs@@ -3,8 +3,8 @@use serde_json::{Value, json};-use crate::*;use crate::cmd::flatten::Highlight;+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/halftone.rs b/crates/engine/src/tests/halftone.rsindex 718c7c523..caef57ddb 100644--- a/crates/engine/src/tests/halftone.rs+++ b/crates/engine/src/tests/halftone.rs@@ -2,9 +2,9 @@use serde_json::json;-use crate::*;use crate::tests_adjust::{fill_hex, node, red_rect, session};use crate::tests_menucmds::{place_undecodable_png, warns_undecoded};+use crate::*;#[test]fn halftone_turns_art_into_dots_by_tone() {diff --git a/crates/engine/src/tests/legacy_ai.rs b/crates/engine/src/tests/legacy_ai.rsindex fdbb29a35..52706abbd 100644--- a/crates/engine/src/tests/legacy_ai.rs+++ b/crates/engine/src/tests/legacy_ai.rs@@ -3,9 +3,9 @@use serde_json::{Value, json};+use crate::tests_links::Folder;use crate::tests_menucmds::{place_undecodable_png, place_undecodable_png_sized};use crate::*;-use crate::tests_links::Folder;/// Three artboards (named A, B and C) with a rectangle on each, on two layers: the first/// rectangle's group (with a second one) on `Layer 1`, the others on `Top`.diff --git a/crates/engine/src/tests/link_paths.rs b/crates/engine/src/tests/link_paths.rsindex 750410de3..2c96be935 100644--- a/crates/engine/src/tests/link_paths.rs+++ b/crates/engine/src/tests/link_paths.rs@@ -5,9 +5,9 @@use serde_json::{Value, json};use vectorcraft_doc::{NodeId, NodeKind};-use crate::*;use crate::cmd::fileio::touched;use crate::tests_links::{Folder, RED, place, png, session};+use crate::*;/// Paths to other computers (and, on Unix, a local file written as one: `//tmp/…`, which Linux/// reads as `/tmp/…`).diff --git a/crates/engine/src/tests/linkwatch.rs b/crates/engine/src/tests/linkwatch.rsindex 027aa6898..8c866b8d9 100644--- a/crates/engine/src/tests/linkwatch.rs+++ b/crates/engine/src/tests/linkwatch.rs@@ -3,8 +3,8 @@use serde_json::{Value, json};-use crate::*;use crate::tests_links::{BLUE, Folder, RED, centre_colour, place, png, session};+use crate::*;/// Write `bytes` to `path` so its modification time moves even on coarse file systems.fn save(path: &str, bytes: &[u8]) {diff --git a/crates/engine/src/tests/opacitymask.rs b/crates/engine/src/tests/opacitymask.rsindex f1cfc0b3d..5f69f6607 100644--- a/crates/engine/src/tests/opacitymask.rs+++ b/crates/engine/src/tests/opacitymask.rs@@ -6,9 +6,9 @@ use serde_json::{Value, json};use vectorcraft_geom::Affine;use vectorcraft_render::{RenderOptions, Renderer};-use crate::*;use crate::cmd::maskedit::MASK_EDIT_LAYER;use crate::tests::{history, select_with_a_step_to_redo};+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/prefs.rs b/crates/engine/src/tests/prefs.rsindex e01df7695..c1b5c73ce 100644--- a/crates/engine/src/tests/prefs.rs+++ b/crates/engine/src/tests/prefs.rs@@ -4,8 +4,8 @@ use serde_json::{Value, json};use vectorcraft_doc::NodeKind;use vectorcraft_tools::{PointerEvent, PointerKind};-use crate::*;use crate::cmd::prefscmds::{PREF_CATEGORIES, PREF_GROUPS, PREF_SPECS, validate};+use crate::*;#[test]fn every_spec_matches_a_prefs_field_and_back() {diff --git a/crates/engine/src/tests/printpresets.rs b/crates/engine/src/tests/printpresets.rsindex 6323cda40..92fe5ab0f 100644--- a/crates/engine/src/tests/printpresets.rs+++ b/crates/engine/src/tests/printpresets.rs@@ -3,8 +3,8 @@use serde_json::json;-use crate::*;use crate::cmd::printpresets::DEFAULT_PRESET;+use crate::*;fn is_bad_params(r: Result<serde_json::Value>) -> bool {matches!(r, Err(EngineError::BadParams { .. }))diff --git a/crates/engine/src/tests/printtiling.rs b/crates/engine/src/tests/printtiling.rsindex 6b15284c0..9d8282053 100644--- a/crates/engine/src/tests/printtiling.rs+++ b/crates/engine/src/tests/printtiling.rs@@ -5,8 +5,8 @@use serde_json::{Value, json};use vectorcraft_tools::{PointerEvent, PointerKind};-use crate::*;use crate::tooling::ViewInfo;+use crate::*;/// A 300 × 200 document with a rectangle.fn session() -> Session {diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rsindex 86af2b73b..fb9959ded 100644--- a/crates/engine/src/tests/recolor.rs+++ b/crates/engine/src/tests/recolor.rs@@ -4,8 +4,8 @@use serde_json::{Value, json};use vectorcraft_color::Color;-use crate::*;use crate::cmd::color_value;+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/recovery.rs b/crates/engine/src/tests/recovery.rsindex d4354620c..cfd72aedf 100644--- a/crates/engine/src/tests/recovery.rs+++ b/crates/engine/src/tests/recovery.rs@@ -7,8 +7,8 @@ use std::sync::Arc;use serde_json::json;-use crate::*;use crate::cmd::recovery::{FolderStore, MemoryStore, RecoveryStore};+use crate::*;/// A session keeping its copies in `store`, with one modified document.fn session_in(store: &Arc<MemoryStore>) -> Session {diff --git a/crates/engine/src/tests/registration.rs b/crates/engine/src/tests/registration.rsindex 07a5dfa9b..87d8cbc9b 100644--- a/crates/engine/src/tests/registration.rs+++ b/crates/engine/src/tests/registration.rs@@ -9,8 +9,8 @@ use vectorcraft_geom::Affine;use vectorcraft_render::proof::ProofSetup;use vectorcraft_render::{RenderOptions, Renderer};-use crate::*;use crate::tests_colormgmt::GLOBAL;+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/save.rs b/crates/engine/src/tests/save.rsindex 4f2baa6d2..a24ee0f2f 100644--- a/crates/engine/src/tests/save.rs+++ b/crates/engine/src/tests/save.rs@@ -7,8 +7,8 @@ use serde_json::{Value, json};use vectorcraft_doc::SavedView;use vectorcraft_geom::Point;-use crate::*;use crate::cmd::fileio::{SaveMode, save_plan};+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/engine/src/tests/saveoptions.rs b/crates/engine/src/tests/saveoptions.rsindex b30e3fb27..ff17ef34e 100644--- a/crates/engine/src/tests/saveoptions.rs+++ b/crates/engine/src/tests/saveoptions.rs@@ -6,8 +6,8 @@ use std::sync::Arc;use serde_json::{Value, json};use vectorcraft_color::cms;-use crate::*;use crate::tests_links::{Folder, png};+use crate::*;/// Three artboards (named A, B and C) with a rectangle on each.fn three_boards() -> Session {diff --git a/crates/engine/src/tests/shortcutset.rs b/crates/engine/src/tests/shortcutset.rsindex bdb298bc1..8f216b8c0 100644--- a/crates/engine/src/tests/shortcutset.rs+++ b/crates/engine/src/tests/shortcutset.rs@@ -4,9 +4,9 @@use serde_json::{Value, json};-use crate::*;use crate::cmd::importmatches;use crate::cmd::shortcutset::{KysEntry, NOT_READABLE, read_kys};+use crate::*;fn read(text: &str) -> Value {Session::new().execute("shortcutSet.read", &json!({ "data": text, "name": "My Keys.kys" })).unwrap()diff --git a/crates/engine/src/tests/smartguides.rs b/crates/engine/src/tests/smartguides.rsindex ee8579626..8bb6a0dfb 100644--- a/crates/engine/src/tests/smartguides.rs+++ b/crates/engine/src/tests/smartguides.rs@@ -6,8 +6,8 @@ use vectorcraft_doc::NodeId;use vectorcraft_geom::{Point, Rect};use vectorcraft_tools::{Mods, Overlay, PointerEvent, PointerKind};-use crate::*;use crate::tooling::ViewInfo;+use crate::*;/// An 800 × 600 document with a 100 × 100 square at (100, 100), nothing selected.fn session() -> Session {diff --git a/crates/engine/src/tests/units.rs b/crates/engine/src/tests/units.rsindex 7cf5be9af..655501c69 100644--- a/crates/engine/src/tests/units.rs+++ b/crates/engine/src/tests/units.rs@@ -6,9 +6,9 @@ use serde_json::json;use vectorcraft_doc::Unit;use vectorcraft_tools::{Mods, Overlay, PointerEvent, PointerKind};-use crate::*;use crate::cmd::prefscmds::{PREF_SPECS, PrefKind, UNITS};use crate::units::Measure;+use crate::*;fn session() -> Session {let mut s = Session::new();diff --git a/crates/pathops/src/planar/tests.rs b/crates/pathops/src/planar/tests.rsindex 0d819c899..bf9340189 100644--- a/crates/pathops/src/planar/tests.rs+++ b/crates/pathops/src/planar/tests.rs@@ -433,10 +433,7 @@ fn shape_builder_gap_detection_closes_small_gaps() {assert!((len - 396.0).abs() < 1e-6, "{len}");// Two paths whose ends miss each other: a U and a lid 3 above it.let u = Shape::new(- PathData::single(SubPath::polyline(- &[Point::new(0.0, 0.0), Point::new(0.0, 100.0), Point::new(100.0, 100.0), Point::new(100.0, 0.0)],- false,- )),+ PathData::single(SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(0.0, 100.0), Point::new(100.0, 100.0), Point::new(100.0, 0.0)], false)),FillRule::NonZero,0,);@@ -493,8 +490,7 @@ fn shape_builder_offers_the_gaps_closed_shapes_enclose() {assert_eq!(shape_builder(&s, true).regions, regions, "the outline edges don't change them");// A ring of four bars that overlap at the corners: the eight pieces of the bars and the// square they enclose.- let s =- [rect(0.0, 0.0, 300.0, 100.0, 0), rect(200.0, 0.0, 300.0, 300.0, 1), rect(0.0, 200.0, 300.0, 300.0, 2), rect(0.0, 0.0, 100.0, 300.0, 3)];+ let s = [rect(0.0, 0.0, 300.0, 100.0, 0), rect(200.0, 0.0, 300.0, 300.0, 1), rect(0.0, 200.0, 300.0, 300.0, 2), rect(0.0, 0.0, 100.0, 300.0, 3)];let regions = shape_builder(&s, false).regions;assert_eq!(regions.len(), 9, "{regions:?}");let gaps: Vec<&Region> = regions.iter().filter(|r| r.sources.is_empty()).collect();@@ -847,8 +843,7 @@ fn run_around_stops_at_the_stops_either_side() {let edge = &lone.edges[0].path.subpaths[0];let corners = [(0.0, 0.0), (100.0, 0.0), (100.0, 100.0), (0.0, 100.0)].map(Point::from);let side = |at: (f64, f64)| {- run_around(edge, &corners, Point::from(at), 1e-3)- .map(|sp| (sp.closed, PathData::single(sp.clone()).length(), PathData::single(sp).bounds()))+ run_around(edge, &corners, Point::from(at), 1e-3).map(|sp| (sp.closed, PathData::single(sp.clone()).length(), PathData::single(sp).bounds()))};assert_eq!(side((50.0, 1.0)), Some((false, 100.0, Some(Rect::new(0.0, 0.0, 100.0, 0.0)))));for at in [(0.5, 50.0), (99.0, 50.0), (50.0, 100.0)] {diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rsindex e76589fcf..aa0acc36f 100644--- a/crates/pdf/src/tests.rs+++ b/crates/pdf/src/tests.rs@@ -34,6 +34,8 @@ mod pdfx;mod presets;mod print;mod printadvanced;+mod reader_compat;+mod reader_streaming;mod realtext;mod settings;pub(super) mod stroke;@@ -41,8 +43,6 @@ mod strokeout;mod text_placement;mod textstroke;mod webview;-mod reader_streaming;-mod reader_compat;fn doc(w: f64, h: f64) -> Document {Document::new(w, h)diff --git a/crates/render/src/fx/tests.rs b/crates/render/src/fx/tests.rsindex fd941dc2c..8c2cd0a3c 100644--- a/crates/render/src/fx/tests.rs+++ b/crates/render/src/fx/tests.rs@@ -164,14 +164,12 @@ fn shadow_rasters_keep_their_node_and_a_byte_budget() {#[test]fn a_coarser_glow_kept_whole_draws_after_a_pan_as_made_again() {let size = (640, 360);- for (rect, blur, zoom, center, scale) in [- (Rect::new(200.0, 300.0, 400.0, 500.0), 100.0, 5.0, (440.0, 400.0), 2.0),- (Rect::new(0.0, 0.0, 595.0, 842.0), 2.0, 8.0, (595.0, 421.0), 3.0),- ] {+ for (rect, blur, zoom, center, scale) in+ [(Rect::new(200.0, 300.0, 400.0, 500.0), 100.0, 5.0, (440.0, 400.0), 2.0), (Rect::new(0.0, 0.0, 595.0, 842.0), 2.0, 8.0, (595.0, 421.0), 3.0)]+ {let mut d = Document::new(595.0, 842.0);let layer = d.layers[0].id;- let mut n =- Node::path(d.alloc_id(), shapes::rectangle(rect), Appearance::basic(Paint::solid(Color::rgb(0.1, 0.3, 0.9)), Paint::None, 0.0));+ let mut n = Node::path(d.alloc_id(), shapes::rectangle(rect), Appearance::basic(Paint::solid(Color::rgb(0.1, 0.3, 0.9)), Paint::None, 0.0));n.appearance.effects = vec![Effect { id: "stylize.outerGlow".into(), params: json!({"blur": blur}), visible: true }];d.insert(Some(layer), 0, n).unwrap();let base = Affine::translate((320.0, 180.0)) * Affine::scale(zoom) * Affine::translate((-center.0, -center.1));@@ -246,8 +244,7 @@ fn per_stroke_raster_effects_use_the_single_threaded_pipeline() {if let Some(vectorcraft_doc::AppearanceItem::Stroke(s)) =n.appearance.items.iter_mut().find(|i| matches!(i, vectorcraft_doc::AppearanceItem::Stroke(_))){- s.effects =- vec![Effect { id: "stylize.outerGlow".into(), params: json!({"color": "#ff0000", "opacity": 100, "blur": 6}), visible: true }];+ s.effects = vec![Effect { id: "stylize.outerGlow".into(), params: json!({"color": "#ff0000", "opacity": 100, "blur": 6}), visible: true }];}d.remove(id).unwrap();d.insert(Some(l), 0, n).unwrap();@@ -275,10 +272,7 @@ fn shaded_doc(mode: vectorcraft_doc::ColorMode, fill: Color, shade: &str, darknelet mut d = doc_with(Rect::new(20.0, 20.0, 60.0, 60.0),fill,- vec![(- "stylize.dropShadow",- json!({"x": 10, "y": 10, "blur": 0, "opacity": 100, "mode": "normal", "shade": shade, "darkness": darkness}),- )],+ vec![("stylize.dropShadow", json!({"x": 10, "y": 10, "blur": 0, "opacity": 100, "mode": "normal", "shade": shade, "darkness": darkness}))],);d.color_mode = mode;d@@ -345,11 +339,8 @@ fn a_drop_shadow_with_color_draws_as_before() {#[test]fn shadow_of_offscreen_object_is_not_culled() {- let d = doc_with(- Rect::new(-60.0, 20.0, -5.0, 60.0),- Color::WHITE,- vec![("stylize.dropShadow", json!({"x": 30, "y": 0, "blur": 0, "opacity": 100}))],- );+ let d =+ doc_with(Rect::new(-60.0, 20.0, -5.0, 60.0), Color::WHITE, vec![("stylize.dropShadow", json!({"x": 30, "y": 0, "blur": 0, "opacity": 100}))]);let img = render(&d);let row: Vec<u32> = (0..10).map(|i| lum(img.pixel(i * 10, 40))).collect();assert!(lum(img.pixel(10, 40)) < 100, "{row:?}");@@ -402,8 +393,7 @@ fn an_outer_glow_blurs_a_solid_silhouette_of_faint_art() {// GUARDS: the glow's strength comes from where the art is, not how opaque it is (a glow round a glow relies on it).let r = Rect::new(30.0, 30.0, 70.0, 70.0);let glow = |fill_opacity: f32| {- let mut d =- doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);+ let mut d = doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);let id = d.layers[0].children().unwrap()[0].id;d.node_mut(id).unwrap().appearance.fill_mut().unwrap().opacity = fill_opacity;render(&d).pixel(29, 50)@@ -419,8 +409,7 @@ fn an_outer_glow_grows_its_silhouette_by_a_quarter_raster_pixel() {// of the document's raster grid, then blurred: a quarter point at 72 ppi, next to nothing at 720.let r = Rect::new(30.0, 30.0, 70.0, 70.0);let green_outside = |ppi: f64| {- let mut d =- doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);+ let mut d = doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);d.raster_effects_ppi = ppi;render(&d).pixel(27, 50)[1]};@@ -452,8 +441,7 @@ fn a_glow_too_large_for_a_full_size_raster_keeps_its_solid_silhouette() {let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };let view = Affine::translate((-1100.0, -1900.0)) * Affine::scale(40.0);let glow = |fill_opacity: f32| {- let mut d =- doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);+ let mut d = doc_with(r, Color::BLACK, vec![("stylize.outerGlow", json!({"color": "#ff0000", "mode": "normal", "opacity": 100, "blur": 4}))]);let id = d.layers[0].children().unwrap()[0].id;d.node_mut(id).unwrap().appearance.fill_mut().unwrap().opacity = fill_opacity;Renderer::new().render(&d, 200, 200, view, &opts).pixel(60, 100)@@ -477,10 +465,8 @@ fn thirty_stacked_glows_draw_quickly_cached_or_not() {Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0),);instanced.symbols.push(vectorcraft_doc::Symbol { name: "Square".into(), art: std::sync::Arc::new(art) });- let mut instance = Node::new(- instanced.alloc_id(),- vectorcraft_doc::NodeKind::SymbolInstance { symbol: "Square".into(), xf: Affine::translate((30.0, 30.0)) },- );+ let mut instance =+ Node::new(instanced.alloc_id(), vectorcraft_doc::NodeKind::SymbolInstance { symbol: "Square".into(), xf: Affine::translate((30.0, 30.0)) });instance.appearance.effects = glows.into_iter().map(|(id, p)| Effect { id: id.into(), params: p, visible: true }).collect();let l = instanced.layers[0].id;instanced.insert(Some(l), 0, instance).unwrap();@@ -655,8 +641,7 @@ fn rasters_drawn_from_a_kept_rasterize_image_count_the_images_it_could_not_decod/// renderer draws.#[test]fn moved_objects_draw_their_effect_rasters_while_interacting() {- let effects =- vec![("stylize.dropShadow", json!({"x": 4, "y": 3, "blur": 2, "opacity": 80})), ("texture.craquelure", json!({"crackSpacing": 6}))];+ let effects = vec![("stylize.dropShadow", json!({"x": 4, "y": 3, "blur": 2, "opacity": 80})), ("texture.craquelure", json!({"crackSpacing": 6}))];let base = doc_with(Rect::new(20.0, 20.0, 50.0, 46.0), Color::rgb(0.9, 0.4, 0.1), effects);let id = base.layers[0].children().unwrap()[0].id;// The object moved from where it started, as each frame of a drag moves it.@@ -851,8 +836,7 @@ fn moved_rasters_need_the_same_content_and_effects() {// Feather clips to the outline: a notch in the top edge where the tiles paint nothing// (x 29 to 33 and y 20 to 24 once moved) leaves the content's pixels as they were.let mut feathered = tiled.clone();- feathered.node_mut(id).unwrap().appearance.effects =- vec![Effect { id: "stylize.feather".into(), params: json!({"radius": 3}), visible: true }];+ feathered.node_mut(id).unwrap().appearance.effects = vec![Effect { id: "stylize.feather".into(), params: json!({"radius": 3}), visible: true }];assert_eq!(drag(&feathered, &moved(&feathered, true, &|_| {})), (1, true), "feathered");let notch = |n: &mut Node| {let mut bp = vectorcraft_geom::BezPath::new();diff --git a/crates/render/src/pattern/tests.rs b/crates/render/src/pattern/tests.rsindex dba6673e1..7a577d757 100644--- a/crates/render/src/pattern/tests.rs+++ b/crates/render/src/pattern/tests.rs@@ -51,11 +51,8 @@ fn effects_after_a_pattern_fill_keep_their_place_and_size() {d.remove(filled).unwrap();if with_pattern {let id = d.alloc_id();- let n = Node::path(- id,- shapes::rectangle(Rect::new(0.0, 0.0, 80.0, 80.0)),- Appearance::basic(pattern_paint("Checks"), Paint::None, 0.0),- );+ let n =+ Node::path(id, shapes::rectangle(Rect::new(0.0, 0.0, 80.0, 80.0)), Appearance::basic(pattern_paint("Checks"), Paint::None, 0.0));d.insert(Some(l), 0, n).unwrap();}let id = d.alloc_id();@@ -257,8 +254,7 @@ fn kept_tiles_count_the_images_they_could_not_decode() {let mut d = doc_with_pattern(TileType::Grid);// A PNG signature with nothing after it.d.images.insert("cut".into(), ImageBlob::new("image/png", b"\x89PNG\r\n\x1a\n".to_vec()));- let im =- ImageObject { key: "cut".into(), width: 10, height: 10, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };+ let im = ImageObject { key: "cut".into(), width: 10, height: 10, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };d.patterns[0].art = vec![Arc::new(Node::new(NodeId(901), NodeKind::Image(Box::new(im))))];let mut r = Renderer::new();let start = tiles_rasterized();@@ -308,11 +304,8 @@ fn edit_mode_draws_only_tile_layer_with_copies() {#[test]fn repeat_renders_instances() {let mut d = Document::new(200.0, 200.0);- let sq = Node::path(- NodeId(50),- shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)),- Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0),- );+ let sq =+ Node::path(NodeId(50), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0));let id = d.alloc_id();let l = d.layers[0].id;d.insert(Some(l), 0, Node::new(id, NodeKind::Repeat(RepeatSpec::grid(vec![Arc::new(sq)], 10.0, 10.0)))).unwrap();diff --git a/crates/render/src/tests/charstroke.rs b/crates/render/src/tests/charstroke.rsindex 45daab916..1dd1d8646 100644--- a/crates/render/src/tests/charstroke.rs+++ b/crates/render/src/tests/charstroke.rs@@ -6,8 +6,8 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{AppearanceItem, Dash, LineJoin, Node, NodeKind};use vectorcraft_geom::Point;-use crate::*;use crate::tests_fontchange::fonts_steady;+use crate::*;const SIZE: u32 = 200;diff --git a/crates/render/src/tests/memory.rs b/crates/render/src/tests/memory.rsindex 844d983b4..34215f909 100644--- a/crates/render/src/tests/memory.rs+++ b/crates/render/src/tests/memory.rs@@ -6,8 +6,8 @@use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};-use crate::*;use crate::tests_fontchange::fonts_steady;+use crate::*;/// A `w`×`h` PNG whose pixels depend on `seed` (each test its own image: the store is shared by/// the tests running alongside).diff --git a/crates/text/src/tests/sysfonts.rs b/crates/text/src/tests/sysfonts.rsindex 5571d5185..7ab8d9029 100644--- a/crates/text/src/tests/sysfonts.rs+++ b/crates/text/src/tests/sysfonts.rs@@ -3,8 +3,8 @@use std::path::{Path, PathBuf};use std::sync::Arc;-use crate::*;use crate::fontdb::fonts_outside;+use crate::*;const FAMILY: &str = "Sysfont Sans3";diff --git a/crates/three-d/src/lib.rs b/crates/three-d/src/lib.rsindex 539c6ef80..43ec2d72a 100644--- a/crates/three-d/src/lib.rs+++ b/crates/three-d/src/lib.rs@@ -591,6 +591,5 @@ pub fn revolve(path: &PathData, bounds: Rect, options: Revolve) -> Result<Vec<FaOk(faces)}-#[cfg(test)]mod tests;diff --git a/crates/three-d/src/tests.rs b/crates/three-d/src/tests.rsindex 2be0d4555..a164c08fe 100644--- a/crates/three-d/src/tests.rs+++ b/crates/three-d/src/tests.rs@@ -1,8 +1,8 @@use super::*;+mod caps;mod lighting;mod multiple_lights;-mod caps;mod smooth;#[test]diff --git a/crates/tools/src/builder/tests.rs b/crates/tools/src/builder/tests.rsindex 2a0f5b1a7..a0a6bfb65 100644--- a/crates/tools/src/builder/tests.rs+++ b/crates/tools/src/builder/tests.rs@@ -978,8 +978,7 @@ fn live_paint_tools_skip_hidden_edges() {let mut bucket = LivePaintBucketTool::default();bucket.pointer(&cx, &ev(PointerKind::Move, x, 50.0).with_mods(shift));assert_eq!(edge_x(&bucket.overlays(&cx)), want.map(|w| w.2), "x {x}");- let stroked =- want.map(|(g, ..)| Action::Exec("livePaint.strokeEdge".into(), json!({ "group": g.0, "point": [x, 50.0], "tolerance": 4.0 })));+ let stroked = want.map(|(g, ..)| Action::Exec("livePaint.strokeEdge".into(), json!({ "group": g.0, "point": [x, 50.0], "tolerance": 4.0 })));assert_eq!(bucket.pointer(&cx, &ev(PointerKind::Down, x, 50.0).with_mods(shift)), stroked.into_iter().collect::<Vec<_>>(), "x {x}");}}diff --git a/crates/tools/src/corners/tests.rs b/crates/tools/src/corners/tests.rsindex 6c07848fc..a1fb0ee52 100644--- a/crates/tools/src/corners/tests.rs+++ b/crates/tools/src/corners/tests.rs@@ -150,8 +150,7 @@ fn widgets_of_a_non_square_rectangle_follow_the_drawn_corners() {assert_eq!(radius(&a[1]), 40.0);// The four arcs, each a quarter circle of radius 40 starting on a side.let arcs = red(t.as_ref()).expect("the limit shows");- let starts: Vec<_> =- arcs.elements().iter().filter_map(|e| if let vectorcraft_geom::PathEl::MoveTo(p) = e { Some(*p) } else { None }).collect();+ let starts: Vec<_> = arcs.elements().iter().filter_map(|e| if let vectorcraft_geom::PathEl::MoveTo(p) = e { Some(*p) } else { None }).collect();assert_eq!(starts, [Point::new(260.0, 100.0), Point::new(300.0, 140.0), Point::new(140.0, 180.0), Point::new(100.0, 140.0)]);// Back below the limit, the outline goes.assert_eq!(radius(&t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 130.0, 130.0))[0]), 30.0);diff --git a/crates/tools/src/direct/tests.rs b/crates/tools/src/direct/tests.rsindex 06a940ac6..311efe223 100644--- a/crates/tools/src/direct/tests.rs+++ b/crates/tools/src/direct/tests.rs@@ -942,10 +942,7 @@ fn alt_during_a_drag_by_an_anchor_toggles_the_copy() {)};assert!(t.pointer(&c, &PointerEvent::new(PointerKind::Down, 300.0, 300.0)).is_empty());- assert_eq!(- t.pointer(&c, &PointerEvent::new(PointerKind::Drag, 250.0, 250.0)),- vec![Action::Begin("Move".into()), preview(-50.0, -50.0, false)]- );+ assert_eq!(t.pointer(&c, &PointerEvent::new(PointerKind::Drag, 250.0, 250.0)), vec![Action::Begin("Move".into()), preview(-50.0, -50.0, false)]);// The tool sees the document as previewed: B moved along, not where the copy leaves it.let (mut moved, _, b2) = two_squares();let l = moved.layers[0].id;diff --git a/crates/tools/src/draw2/gesture/tests.rs b/crates/tools/src/draw2/gesture/tests.rsindex 5cc7684ea..2daac5705 100644--- a/crates/tools/src/draw2/gesture/tests.rs+++ b/crates/tools/src/draw2/gesture/tests.rs@@ -547,9 +547,9 @@ fn pencil_shows_the_continuation_cursor_over_an_end_a_line_continues() {let shift_alt = Mods { shift: true, alt: true, ..Default::default() };// The release's stroke: a straight line that continues the path.let continues = |acts: &[Vec<Action>]| {- acts.last().and_then(|a| a.first()).is_some_and(- |a| matches!(a, Action::Preview(_, v) if v.get("extend").is_some() && v["points"].as_array().is_some_and(|q| q.len() == 2)),- )+ acts.last()+ .and_then(|a| a.first())+ .is_some_and(|a| matches!(a, Action::Preview(_, v) if v.get("extend").is_some() && v["points"].as_array().is_some_and(|q| q.len() == 2)))};for alt_smooth in [false, true] {for m in [Mods::default(), shift, alt, shift_alt] {diff --git a/crates/tools/src/guides/tests.rs b/crates/tools/src/guides/tests.rsindex 9ed34c4fc..517937c74 100644--- a/crates/tools/src/guides/tests.rs+++ b/crates/tools/src/guides/tests.rs@@ -79,10 +79,8 @@ fn scale_snap_lands_the_handle_on_anchors() {let l = d.layers[0].id;let id = d.alloc_id();// A triangle whose apex (320, 400) lines up with none of the edges or centres on x.- let tri = vectorcraft_geom::PathData::single(SubPath::polyline(- &[Point::new(300.0, 300.0), Point::new(380.0, 300.0), Point::new(320.0, 400.0)],- true,- ));+ let tri =+ vectorcraft_geom::PathData::single(SubPath::polyline(&[Point::new(300.0, 300.0), Point::new(380.0, 300.0), Point::new(320.0, 400.0)], true));d.insert(Some(l), 1, Node::path(id, tri, Appearance::default_art())).unwrap();let t = Targets::collect(&d, &[], None);let snap = |r: Rect, h: Handle, p: Point, shift: bool| {@@ -133,8 +131,7 @@ fn spacing_guides_space_a_moved_selection_evenly() {// Halfway between B and a box at 220–260: 50 either side.let mut wide = d.clone();let id = wide.alloc_id();- wide.insert(Some(l), 0, Node::path(id, vectorcraft_geom::shapes::rectangle(Rect::new(220.0, 300.0, 260.0, 340.0)), Default::default()))- .unwrap();+ wide.insert(Some(l), 0, Node::path(id, vectorcraft_geom::shapes::rectangle(Rect::new(220.0, 300.0, 260.0, 340.0)), Default::default())).unwrap();let (dv, ov) = Targets::for_move(&cx(&wide, &s, &p), &s.objects).snap_rect(Rect::new(148.0, 305.0, 188.0, 345.0), 4.0);assert_eq!(dv, Vec2::new(2.0, 0.0));assert!(lines(&ov) >= 6, "{ov:?}");@@ -197,9 +194,7 @@ fn display_options_colour_and_hide_the_guides_but_keep_the_snap() {let (q, ov) = t.snap_point(Point::new(301.0, 199.0), 4.0);assert_eq!(q.y, 200.0);assert!(ov.iter().all(|o| matches!(o, Overlay::Line { color, .. } | Overlay::Label { color, .. } if *color == green)), "{ov:?}");- assert!(- ov.iter().any(|o| matches!(o, Overlay::Line { .. })) && ov.iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "align"))- );+ assert!(ov.iter().any(|o| matches!(o, Overlay::Line { .. })) && ov.iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "align")));// Alignment Guides off: the point still lines up and says so, without the line.let c = ToolContext { alignment_guides: false, ..cx(&d, &s, &p) };let t = Targets::collect(&d, &[], None).styled(&c);@@ -294,10 +289,8 @@ fn dragged_end_of_a_slanted_line_keeps_to_its_extension() {// Two anchors moving, the middle one staying put: no telling which one the pointer drags,// so neither keeps to the extension of its segment.let id = d.alloc_id();- let bent = vectorcraft_geom::PathData::single(SubPath::polyline(- &[Point::new(250.0, 450.0), Point::new(300.0, 400.0), Point::new(380.0, 340.0)],- false,- ));+ let bent =+ vectorcraft_geom::PathData::single(SubPath::polyline(&[Point::new(250.0, 450.0), Point::new(300.0, 400.0), Point::new(380.0, 340.0)], false));d.insert(Some(l), 1, Node::path(id, bent, Appearance::default_art())).unwrap();let mut s = Selection::default();s.set([id]);diff --git a/crates/tools/src/pen/tests.rs b/crates/tools/src/pen/tests.rsindex 925b76089..408dde110 100644--- a/crates/tools/src/pen/tests.rs+++ b/crates/tools/src/pen/tests.rs@@ -6,8 +6,7 @@ use vectorcraft_doc::Selection;fn press_inside_drag_threshold_places_a_corner() {let (d, s) = (vectorcraft_doc::Document::new(500.0, 500.0), Selection::default());let paint = paint();- let cx =- ToolContext { zoom: 1.0, smart_guides: false, snap_to_point: false, snap_to_pixel: false, snap_to_grid: false, ..cx(&d, &s, &paint) };+ let cx = ToolContext { zoom: 1.0, smart_guides: false, snap_to_point: false, snap_to_pixel: false, snap_to_grid: false, ..cx(&d, &s, &paint) };let mut pen = PenTool::default();pen.pointer(&cx, &PointerEvent::new(PointerKind::Down, 100.0, 100.0));assert!(pen.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 101.0, 101.0)).is_empty());@@ -231,8 +230,7 @@ fn alt_pressed_mid_drag_keeps_the_incoming_handle() {fn space_pressed_inside_the_drag_threshold_moves_the_anchor_by_the_next_move_only() {let (d, s) = (vectorcraft_doc::Document::new(500.0, 500.0), Selection::default());let paint = paint();- let cx =- ToolContext { zoom: 1.0, smart_guides: false, snap_to_point: false, snap_to_pixel: false, snap_to_grid: false, ..cx(&d, &s, &paint) };+ let cx = ToolContext { zoom: 1.0, smart_guides: false, snap_to_point: false, snap_to_pixel: false, snap_to_grid: false, ..cx(&d, &s, &paint) };let space = Mods { space: true, ..Mods::default() };let mut pen = PenTool::default();pen.pointer(&cx, &PointerEvent::new(PointerKind::Down, 100.0, 100.0));@@ -282,10 +280,7 @@ fn space_moves_the_anchor_being_placed() {let acts = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 450.0, 450.0).with_mods(Mods { space: true, ..alt }));assert_eq!(acts,- vec![Action::Preview(- "path.appendAnchor".into(),- json!({"id": id.0, "x": 400.0, "y": 400.0, "in": [350.0, 400.0], "out": [450.0, 450.0]})- )]+ vec![Action::Preview("path.appendAnchor".into(), json!({"id": id.0, "x": 400.0, "y": 400.0, "in": [350.0, 400.0], "out": [450.0, 450.0]}))]);}@@ -591,9 +586,8 @@ fn a_drag_from_the_first_anchor_always_closes() {// What the tool sees once the preview applied: the path closed.d.node_mut(id).unwrap().path_data_mut().unwrap().subpaths[0].closed = true;let c = cx(&d, &s, &p);- let close = |x: f64, y: f64, alt: bool| {- vec![Action::Preview("path.close".into(), json!({"id": id.0, "in": [200.0 - x, 600.0 - y], "independent": alt}))]- };+ let close =+ |x: f64, y: f64, alt: bool| vec![Action::Preview("path.close".into(), json!({"id": id.0, "in": [200.0 - x, 600.0 - y], "independent": alt}))];for (x, y) in [(105.0, 290.0), (130.0, 260.0), (160.0, 240.0)] {assert_eq!(t.pointer(&c, &PointerEvent::new(PointerKind::Drag, x, y)), close(x, y, false), "at ({x}, {y})");}@@ -623,12 +617,8 @@ fn clicking_a_selected_blend_spine_adds_a_point() {std::sync::Arc::new(vectorcraft_doc::Node::path(id, r, vectorcraft_doc::Appearance::default_art()))};let (g, k1, k2) = (d.alloc_id(), d.alloc_id(), d.alloc_id());- d.insert(- Some(l),- 1,- vectorcraft_doc::Node::new(g, NodeKind::Blend { children: vec![key(k1, 100.0), key(k2, 200.0)], spec: Default::default() }),- )- .unwrap();+ d.insert(Some(l), 1, vectorcraft_doc::Node::new(g, NodeKind::Blend { children: vec![key(k1, 100.0), key(k2, 200.0)], spec: Default::default() }))+ .unwrap();let mut s = Selection::default();s.set([g]);let p = paint();@@ -697,9 +687,10 @@ fn anchors_snap_to_smart_guides() {t.pointer(&cx, &PointerEvent::new(PointerKind::Move, 152.0, 318.0));let o = t.overlays(&cx);assert!(o.iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "align" && *p == Point::new(150.0, 318.0))), "{o:?}");- assert!(o.iter().any(- |o| matches!(o, Overlay::Path { path, .. } if path.elements().last().and_then(|e| e.end_point()) == Some(Point::new(150.0, 318.0)))- ));+ assert!(+ o.iter()+ .any(|o| matches!(o, Overlay::Path { path, .. } if path.elements().last().and_then(|e| e.end_point()) == Some(Point::new(150.0, 318.0))))+ );let from = Point::new(60.0, 300.0);let to = Point::new(150.0, 318.0);assert!(o.iter().any(|o| matches!(o, Overlay::Measure { text, .. } if text == &cx.segment_measure_label(from, to))));diff --git a/crates/tools/src/rulerguide/tests.rs b/crates/tools/src/rulerguide/tests.rsindex 67b37412b..7fa192d9e 100644--- a/crates/tools/src/rulerguide/tests.rs+++ b/crates/tools/src/rulerguide/tests.rs@@ -505,8 +505,7 @@ fn ruler_guide_origin_leaves_other_snap_modes_unchanged() {let actions = new.pointer(&c, &ev(PointerKind::Drag, pointer.x, pointer.y, Mods::default()), true);assert!((guide_preview_position(&actions, vertical, None) - want).abs() < 1e-8);let mut moved = GuideEdit::default();- let (start, to) =- if vertical { ((from, pointer.y), (pointer.x, pointer.y)) } else { ((pointer.x, from), (pointer.x, pointer.y)) };+ let (start, to) = if vertical { ((from, pointer.y), (pointer.x, pointer.y)) } else { ((pointer.x, from), (pointer.x, pointer.y)) };moved.press(&c, &ev(PointerKind::Down, start.0, start.1, Mods::default())).unwrap();let actions = moved.pointer(&c, &ev(PointerKind::Drag, to.0, to.1, Mods::default())).unwrap();assert!((guide_preview_position(&actions, vertical, Some(from)) - want).abs() < 1e-8);@@ -584,8 +583,7 @@ fn ruler_guide_readouts_count_from_the_active_artboard_with_artboard_rulers() {(vectorcraft_doc::RulerMode::Global, 1, Point::new(5.0, 5.0)),] {doc.rulers = rulers;- let c =- ToolContext { ruler_origin: doc.ruler_origin_for(active), smart_guides: false, snap_to_point: false, ..cx(&doc, &selection, &paint) };+ let c = ToolContext { ruler_origin: doc.ruler_origin_for(active), smart_guides: false, snap_to_point: false, ..cx(&doc, &selection, &paint) };assert_eq!(c.ruler_origin, zero, "{rulers:?} {active}");for vertical in [true, false] {let mut new = NewGuide::new(&c, vertical, None);diff --git a/crates/tools/src/select/tests.rs b/crates/tools/src/select/tests.rsindex 32798d896..f777d59cc 100644--- a/crates/tools/src/select/tests.rs+++ b/crates/tools/src/select/tests.rs@@ -672,12 +672,8 @@ fn a_shift_move_lined_up_by_smart_guides_stays_on_its_line() {let (mut d, id) = doc_with_rect();let l = d.layers[0].id;let other = d.alloc_id();- d.insert(- Some(l),- 1,- vectorcraft_doc::Node::path(other, vectorcraft_geom::shapes::rectangle(r), vectorcraft_doc::Appearance::default_art()),- )- .unwrap();+ d.insert(Some(l), 1, vectorcraft_doc::Node::path(other, vectorcraft_geom::shapes::rectangle(r), vectorcraft_doc::Appearance::default_art()))+ .unwrap();(d, id)};let p = paint();@@ -1020,10 +1016,7 @@ fn marquee_selects_ruler_guides() {let a = t.pointer(&cx, &ev(PointerKind::Up, 120.0, 120.0));assert_eq!(a,- vec![- Action::Exec("select.set".into(), json!({"ids": [id.0]})),- Action::Exec("guide.select".into(), json!({"indexes": [0], "toggle": true})),- ]+ vec![Action::Exec("select.set".into(), json!({"ids": [id.0]})), Action::Exec("guide.select".into(), json!({"indexes": [0], "toggle": true})),]);}@@ -1484,10 +1477,7 @@ fn loaded_text_threads_into_the_art_on_a_layer_masks_edge() {t.pointer(&cx, &ev(PointerKind::Down, port.x, port.y));t.pointer(&cx, &ev(PointerKind::Up, port.x, port.y));t.pointer(&cx, &ev(PointerKind::Down, 498.5, 450.0));- assert_eq!(- t.pointer(&cx, &ev(PointerKind::Up, 498.5, 450.0)),- vec![Action::Exec("text.thread.add".into(), json!({"from": id.0, "to": art.0}))]- );+ assert_eq!(t.pointer(&cx, &ev(PointerKind::Up, 498.5, 450.0)), vec![Action::Exec("text.thread.add".into(), json!({"from": id.0, "to": art.0}))]);}/// A double-click on type where a layer's clipping mask edge runs through it edits the type,diff --git a/crates/tools/src/shape/tests.rs b/crates/tools/src/shape/tests.rsindex 5086e393e..66a4abad9 100644--- a/crates/tools/src/shape/tests.rs+++ b/crates/tools/src/shape/tests.rs@@ -198,10 +198,7 @@ fn click_opens_dialog() {let cx = cx(&d, &s, &p);let mut t = ShapeTool::new("star");t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 10.0, 10.0));- assert_eq!(- t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 10.0, 10.0)),- vec![Action::Dialog("star".into(), json!({"x": 10.0, "y": 10.0}))]- );+ assert_eq!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 10.0, 10.0)), vec![Action::Dialog("star".into(), json!({"x": 10.0, "y": 10.0}))]);}#[test]diff --git a/crates/ui-egui/src/canvas/tests.rs b/crates/ui-egui/src/canvas/tests.rsindex 5ba194a9d..55a1341ab 100644--- a/crates/ui-egui/src/canvas/tests.rs+++ b/crates/ui-egui/src/canvas/tests.rs@@ -735,11 +735,10 @@ fn double_clicking_an_artboard_name_edits_it() {let rect = app.canvas_rect.unwrap();let xf = Xf::new(rect, app.view().unwrap());let mut target = None;- let _ =- ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() }, |ui| {- let ab = &app.session.active().unwrap().doc.artboards[0];- target = Some(tool_name_rect(ui.painter(), &xf, ab.rect, 0, &ab.name).center());- });+ let _ = ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() }, |ui| {+ let ab = &app.session.active().unwrap().doc.artboards[0];+ target = Some(tool_name_rect(ui.painter(), &xf, ab.rect, 0, &ab.name).center());+ });let at = target.unwrap();assert!(rect.contains(at), "the name is in the working area, at {at:?} canvas {rect:?}");let before = app.session.active().unwrap().doc.artboards.len();@@ -774,11 +773,10 @@ fn double_clicking_a_locked_artboards_name_leaves_it() {let rect = app.canvas_rect.unwrap();let xf = Xf::new(rect, app.view().unwrap());let mut target = None;- let _ =- ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() }, |ui| {- let ab = &app.session.active().unwrap().doc.artboards[0];- target = Some(tool_name_rect(ui.painter(), &xf, ab.rect, 0, &ab.name).center());- });+ let _ = ctx.run_ui(egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() }, |ui| {+ let ab = &app.session.active().unwrap().doc.artboards[0];+ target = Some(tool_name_rect(ui.painter(), &xf, ab.rect, 0, &ab.name).center());+ });let at = target.unwrap();let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };for _ in 0..2 {@@ -908,8 +906,7 @@ fn a_click_just_outside_the_canvas_does_not_reach_the_tool() {frame_under_bar(&mut app, &ctx, vec![]);let rect = app.canvas_rect.unwrap();let click = |app: &mut VectorcraftApp, p: Pos2| {- let button =- |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame_under_bar(app, &ctx, vec![egui::Event::PointerMoved(p)]);frame_under_bar(app, &ctx, vec![button(true)]);frame_under_bar(app, &ctx, vec![button(false)]);@@ -1124,9 +1121,8 @@ fn guides_from_the_rulers_snap_and_artboard_guides_span_their_artboard() {let y = xf.to_screen(Point::new(0.0, 300.0)).y;let window = app.canvas_rect.unwrap();assert!(- s.iter().any(- |s| matches!(s, Shape::LineSegment { points, .. } if points[0] == pos2(window.left(), y) && points[1] == pos2(window.right(), y))- )+ s.iter()+ .any(|s| matches!(s, Shape::LineSegment { points, .. } if points[0] == pos2(window.left(), y) && points[1] == pos2(window.right(), y))));}@@ -2014,11 +2010,8 @@ fn a_drag_over_a_wide_blur_draws_the_blur_from_the_still_frame() {// for them is shown.let run = |app: &mut VectorcraftApp, events: Vec<egui::Event>| {let frame = |app: &mut VectorcraftApp, events| {- let raw = egui::RawInput {- screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 870.0))),- events,- ..Default::default()- };+ let raw =+ egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 870.0))), events, ..Default::default() };let mut out = ctx.run_ui(raw, |ui| show(app, ui));out.textures_delta.clear();};@@ -2042,8 +2035,7 @@ fn a_drag_over_a_wide_blur_draws_the_blur_from_the_still_frame() {assert_eq!(app.canvas.from_worker, on_worker);assert!(!moved(&app), "a still frame, on the worker: {on_worker}");let at = app.canvas_rect.unwrap().center();- let button =- |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };run(&mut app, vec![egui::Event::PointerMoved(at)]);run(&mut app, vec![button(at, true)]);for step in [1.0, 2.0, 3.0] {@@ -2751,9 +2743,8 @@ fn grid_repeat_handles_set_rows_and_spacing_in_one_undo_step_each() {let g = handles(&mut app);let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let drawn = shapes(&mut app, &ctx);- let circle_at = |drawn: &[Shape], at: Pos2| {- drawn.iter().any(|s| matches!(s, Shape::Circle(c) if c.center.distance(at) < 0.01 && c.radius == HANDLE_RADIUS))- };+ let circle_at =+ |drawn: &[Shape], at: Pos2| drawn.iter().any(|s| matches!(s, Shape::Circle(c) if c.center.distance(at) < 0.01 && c.radius == HANDLE_RADIUS));assert!(circle_at(&drawn, xf.to_screen(g.rows_at)), "the row handle is drawn");assert!(circle_at(&drawn, xf.to_screen(g.corner_at)), "the corner handle is drawn");app.ui.view.bounding_box = false;@@ -3040,8 +3031,7 @@ fn a_moving_view_leaves_the_art_under_the_pointer_unhighlighted_until_it_stops()let mut time = 0.0;let mut outlines = |app: &mut VectorcraftApp, events: Vec<egui::Event>, dt: f64| {time += dt;- let mut out =- ctx.run_ui(egui::RawInput { time: Some(time), screen_rect: Some(screen), events, ..Default::default() }, |ui| show(app, ui));+ let mut out = ctx.run_ui(egui::RawInput { time: Some(time), screen_rect: Some(screen), events, ..Default::default() }, |ui| show(app, ui));out.textures_delta.clear();let mut shapes = vec![];out.shapes.iter().for_each(|c| flat(&c.shape, &mut shapes));@@ -3905,12 +3895,8 @@ fn two_fingers_dragged_together_pan_the_canvas() {/// A canvas frame at input time `t` (seconds) with `events`, for the trackpad rotation tests.fn timed_frame(app: &mut VectorcraftApp, ctx: &egui::Context, t: f64, events: Vec<egui::Event>) {- let raw = egui::RawInput {- screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))),- time: Some(t),- events,- ..Default::default()- };+ let raw =+ egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), time: Some(t), events, ..Default::default() };let mut out = ctx.run_ui(raw, |ui| show(app, ui));out.textures_delta.clear();}@@ -4023,10 +4009,8 @@ fn fit_artboard_fits_the_artboard_turned_with_the_view() {let board = app.session.active().unwrap().doc.artboards[0].rect;let q = Xf::new(rect, app.view().unwrap()).quad(board);assert!(q.iter().all(|c| rect.contains(*c)), "the turned artboard is on the canvas: {q:?}");- let gap = q- .iter()- .map(|c| (c.x - rect.left()).min(rect.right() - c.x).min(c.y - rect.top()).min(rect.bottom() - c.y))- .fold(f32::INFINITY, f32::min);+ let gap =+ q.iter().map(|c| (c.x - rect.left()).min(rect.right() - c.x).min(c.y - rect.top()).min(rect.bottom() - c.y)).fold(f32::INFINITY, f32::min);assert!(gap < 31.0, "and fills it but for the margin: {gap}");}@@ -4306,8 +4290,7 @@ fn a_rotate_view_drag_shows_a_dial_with_the_angle() {}_ => None,});- let text =- s.iter().find_map(|s| if let Shape::Text(t) = s { Some(t.galley.text().to_string()).filter(|t| t.ends_with('°')) } else { None });+ let text = s.iter().find_map(|s| if let Shape::Text(t) = s { Some(t.galley.text().to_string()).filter(|t| t.ends_with('°')) } else { None });(circle, needle, text)};assert_eq!(dial(&mut app), (None, None, None), "no dial before a drag");@@ -4391,8 +4374,7 @@ fn double_clicking_type_with_the_selection_tool_puts_the_caret_there() {let ctx = egui::Context::default();let timed = |app: &mut VectorcraftApp, time: f64, events: Vec<egui::Event>| {let screen = egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0));- let mut out =- ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| show(app, ui));+ let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| show(app, ui));out.textures_delta.clear();};timed(&mut app, 0.0, vec![]);@@ -4571,8 +4553,7 @@ fn double_clicking_type_with_the_direct_selection_tool_puts_the_caret_there() {fn escape_while_editing_in_isolation_returns_to_selection_tool_and_keeps_isolation_until_second_escape() {let mut app = VectorcraftApp::new(Session::new(), Default::default());app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();- let tid =- app.session.execute("text.create", &json!({"x": 100, "y": 150, "text": "Nested hello", "size": 24})).unwrap()["id"].as_u64().unwrap();+ let tid = app.session.execute("text.create", &json!({"x": 100, "y": 150, "text": "Nested hello", "size": 24})).unwrap()["id"].as_u64().unwrap();// Group the text inside a group.app.session.execute("select.all", &json!({})).unwrap();app.session.execute("object.group", &json!({})).unwrap();@@ -4680,8 +4661,7 @@ fn a_library_symbol_dropped_on_the_canvas_is_added_and_placed_there_in_one_step(fn a_brush_dropped_on_a_path_is_applied_to_it() {let mut app = VectorcraftApp::new(Session::new(), Default::default());app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();- let id =- app.session.execute("path.create", &json!({"anchors": [{"x": 100, "y": 150}, {"x": 300, "y": 150}]})).unwrap()["id"].as_u64().unwrap();+ let id = app.session.execute("path.create", &json!({"anchors": [{"x": 100, "y": 150}, {"x": 300, "y": 150}]})).unwrap()["id"].as_u64().unwrap();app.session.execute("select.none", &json!({})).unwrap();let ctx = egui::Context::default();frame(&mut app, &ctx, vec![]);@@ -4708,8 +4688,7 @@ fn a_brush_dropped_on_a_path_is_applied_to_it() {fn a_library_brush_dropped_on_a_path_is_added_and_applied_in_one_step() {let mut app = VectorcraftApp::new(Session::new(), Default::default());app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();- let id =- app.session.execute("path.create", &json!({"anchors": [{"x": 100, "y": 150}, {"x": 300, "y": 150}]})).unwrap()["id"].as_u64().unwrap();+ let id = app.session.execute("path.create", &json!({"anchors": [{"x": 100, "y": 150}, {"x": 300, "y": 150}]})).unwrap()["id"].as_u64().unwrap();app.session.execute("select.none", &json!({})).unwrap();let ctx = egui::Context::default();frame(&mut app, &ctx, vec![]);@@ -4866,12 +4845,8 @@ fn art_moved_off_the_canvas_waits_and_drops_on_the_panel() {let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let before = app.session.active().unwrap().doc.clone();let undo = app.session.active().unwrap().history.undo.len();- let button = |pos: Pos2, pressed: bool| egui::Event::PointerButton {- pos,- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let button =+ |pos: Pos2, pressed: bool| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };let start = xf.to_screen(Point::new(100.0, 100.0));let left = |app: &VectorcraftApp| app.session.active().unwrap().doc.node(id).unwrap().geometric_bounds().unwrap().x0;let moved_to = |screen: Pos2| 50.0 + xf.to_doc(screen).x - 100.0;@@ -4904,12 +4879,8 @@ fn art_moved_off_the_canvas_resumes_when_the_pointer_returns() {frame(&mut app, &ctx, vec![]);let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let undo = app.session.active().unwrap().history.undo.len();- let button = |pos: Pos2, pressed: bool| egui::Event::PointerButton {- pos,- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let button =+ |pos: Pos2, pressed: bool| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };let start = xf.to_screen(Point::new(100.0, 100.0));let left = |app: &VectorcraftApp| app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().geometric_bounds().unwrap().x0;let moved_to = |screen: Pos2| 50.0 + xf.to_doc(screen).x - 100.0;@@ -4971,12 +4942,8 @@ fn a_move_released_over_a_panel_ends_before_the_panels_draw() {let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let before = app.session.active().unwrap().doc.clone();let undo = app.session.active().unwrap().history.undo.len();- let button = |pos: Pos2, pressed: bool| egui::Event::PointerButton {- pos,- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let button =+ |pos: Pos2, pressed: bool| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };let start = xf.to_screen(Point::new(100.0, 100.0));frame(&mut app, &ctx, vec![egui::Event::PointerMoved(start), button(start, true)]);frame(&mut app, &ctx, vec![egui::Event::PointerMoved(start + vec2(40.0, 0.0))]);@@ -5035,9 +5002,8 @@ fn japanese_ime_composes_on_the_canvas_with_its_window_at_the_caret() {crate::menus::invoke(&mut app, "edit.undo", json!({}));assert!(!crate::menus::enabled(&app, "edit.undo"));assert_eq!(plain(&app, id), "ががく");- let ime2 =- typing_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "雅楽".into(), active_range_chars: Some(0..2) })])- .unwrap();+ let ime2 = typing_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "雅楽".into(), active_range_chars: Some(0..2) })])+ .unwrap();assert!(ime2.rect.center().x <= ime.rect.center().x + 1.0, "the window stays at the clause being converted");typing_frame(&mut app, &ctx, vec![preedit("", 0), egui::Event::Ime(egui::ImeEvent::Commit("雅楽".into()))]);assert_eq!(plain(&app, id), "雅楽");@@ -5465,12 +5431,11 @@ fn tool_drag_moved_without_pointer_delta() {let b = pos2(150.0, 120.0);let mut first = false;let mut second = false;- let mut out =- ctx.run_ui(egui::RawInput { screen_rect: Some(rect), events: vec![egui::Event::PointerMoved(a)], ..Default::default() }, |ui| {- let pointer = ui.input(|i| i.pointer.clone());- first = tool_drag_moved(ui, &xf, a, &pointer);- second = tool_drag_moved(ui, &xf, a, &pointer);- });+ let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(rect), events: vec![egui::Event::PointerMoved(a)], ..Default::default() }, |ui| {+ let pointer = ui.input(|i| i.pointer.clone());+ first = tool_drag_moved(ui, &xf, a, &pointer);+ second = tool_drag_moved(ui, &xf, a, &pointer);+ });out.textures_delta.clear();assert!(first, "the first drag sample at a position runs");assert!(!second, "the same position without a delta is not sent again");@@ -5494,13 +5459,12 @@ fn stationary_press_is_not_a_drag() {let xf = Xf::new(rect, &v);let a = pos2(100.0, 100.0);let b = pos2(150.0, 120.0);- let mut out =- ctx.run_ui(egui::RawInput { screen_rect: Some(rect), events: vec![egui::Event::PointerMoved(a)], ..Default::default() }, |ui| {- ui.data_mut(|d| {- d.remove::<Point>(tool_drag_doc_id());- d.insert_temp(tool_press_doc_id(), xf.to_doc(a));- });+ let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(rect), events: vec![egui::Event::PointerMoved(a)], ..Default::default() }, |ui| {+ ui.data_mut(|d| {+ d.remove::<Point>(tool_drag_doc_id());+ d.insert_temp(tool_press_doc_id(), xf.to_doc(a));});+ });out.textures_delta.clear();let mut held = true;out = ctx.run_ui(egui::RawInput { screen_rect: Some(rect), ..Default::default() }, |ui| {@@ -5751,8 +5715,7 @@ fn the_hosts_pen_pressure_drives_the_tools_under_mouse_events() {// One frame per sample: the reader has set the pressure before the frame's mouse events.let stroke = |app: &mut VectorcraftApp, pts: &[(f64, f64, Option<f32>)]| {let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());- let button =- |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };let mut at = Pos2::ZERO;for (i, &(x, y, pressure)) in pts.iter().enumerate() {feed.set(pressure);@@ -6017,8 +5980,7 @@ fn a_mouse_stroke_keeps_every_move_of_a_frame() {app.select_tool("pencil");let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let at = |x: f64, y: f64| xf.to_screen(Point::new(x, y));- let button =- |p, pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };+ let button = |p, pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };let start = at(100.0, 100.0);frame(&mut app, &ctx, vec![egui::Event::PointerMoved(start), button(start, true)]);// One frame of a fast stroke: a zigzag of 20 moves, 6 pt apart.@@ -6050,8 +6012,7 @@ fn a_mouse_stroke_keeps_a_frame_that_ends_where_it_started() {app.select_tool("pencil");let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());let at = |x: f64, y: f64| xf.to_screen(Point::new(x, y));- let button =- |p, pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };+ let button = |p, pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };let (start, a) = (at(100.0, 100.0), at(160.0, 100.0));frame(&mut app, &ctx, vec![egui::Event::PointerMoved(start), button(start, true)]);frame(&mut app, &ctx, vec![egui::Event::PointerMoved(a)]);@@ -6122,8 +6083,7 @@ fn the_task_bar_recolors_coloured_art() {let bar = task_bar_rect(&ctx).expect("the task bar shows");// Right to left: the frame's margin, More Options, Lock, then Recolor.let at = pos2(bar.right() - 8.0 - 30.0 - 6.0 - 30.0 - 6.0 - 15.0, bar.center().y);- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(app, &ctx, vec![egui::Event::PointerMoved(at)]);frame(app, &ctx, vec![button(true)]);frame(app, &ctx, vec![button(false)]);@@ -6162,8 +6122,7 @@ fn the_task_bar_traces_an_image_then_expands_the_trace() {let bar = task_bar_rect(&ctx).expect("the task bar shows");// Left to right: the frame's margin, the handle and its spacing, then the first button.let at = pos2(bar.left() + 8.0 + 4.0 + 6.0 + 12.0, bar.center().y);- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(app, &ctx, vec![egui::Event::PointerMoved(at)]);frame(app, &ctx, vec![button(true)]);frame(app, &ctx, vec![button(false)]);@@ -6198,9 +6157,7 @@ fn task_bar_labels(app: &mut VectorcraftApp, ctx: &egui::Context) -> Vec<(Stringout.shapes.iter().filter_map(|c| match &c.shape {- egui::Shape::Text(t) if bar.contains(t.visual_bounding_rect().center()) => {- Some((t.galley.text().to_string(), t.visual_bounding_rect()))- }+ egui::Shape::Text(t) if bar.contains(t.visual_bounding_rect().center()) => Some((t.galley.text().to_string(), t.visual_bounding_rect())),_ => None,}).collect()@@ -6258,8 +6215,7 @@ fn the_artboard_tools_task_bar_buttons_act_on_the_selected_artboards() {let press = |app: &mut VectorcraftApp, label: &str| {let labels = task_bar_labels(app, &ctx);let at = labels.iter().find(|(t, _)| t == label).unwrap_or_else(|| panic!("{label} in {labels:?}")).1.center();- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(app, &ctx, vec![egui::Event::PointerMoved(at)]);frame(app, &ctx, vec![button(true)]);frame(app, &ctx, vec![button(false)]);@@ -6300,15 +6256,13 @@ fn the_task_bar_connects_cuts_and_converts_direct_selected_anchors() {let press = |app: &mut VectorcraftApp, label: &str| {let labels = task_bar_labels(app, &ctx);let at = labels.iter().find(|(t, _)| t == label).unwrap_or_else(|| panic!("{label} in {labels:?}")).1.center();- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(app, &ctx, vec![egui::Event::PointerMoved(at)]);frame(app, &ctx, vec![button(true)]);frame(app, &ctx, vec![button(false)]);};- let subpath = |app: &VectorcraftApp| {- app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().path_data().unwrap().subpaths[0].clone()- };+ let subpath =+ |app: &VectorcraftApp| app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().path_data().unwrap().subpaths[0].clone();let last_undo = |app: &VectorcraftApp| app.session.active().unwrap().history.undo.last().unwrap().label.clone();press(&mut app, "Smooth");let a = subpath(&app).anchors[1];@@ -6700,9 +6654,8 @@ fn gap_label(s: &[Shape]) -> Option<(egui::Rect, Option<egui::Rect>)> {let magenta = c32(vectorcraft_tools::guides::MAGENTA);let text =s.iter().find_map(|s| if let Shape::Text(t) = s { (t.galley.text() == "100.00 pt").then(|| t.visual_bounding_rect()) } else { None })?;- let pill = s- .iter()- .find_map(|s| if let Shape::Rect(r) = s { (r.fill == magenta && r.rect.contains(text.center())).then_some(r.rect) } else { None });+ let pill =+ s.iter().find_map(|s| if let Shape::Rect(r) = s { (r.fill == magenta && r.rect.contains(text.center())).then_some(r.rect) } else { None });Some((text, pill))}@@ -6981,8 +6934,7 @@ fn live_trace_selection_highlight_excludes_the_retained_source_rectangle() {})),);source.visible = false;- let art =- Node::path(NodeId(3), vectorcraft_geom::shapes::rectangle(vectorcraft_geom::Rect::new(20.0, 30.0, 80.0, 90.0)), Appearance::default());+ let art = Node::path(NodeId(3), vectorcraft_geom::shapes::rectangle(vectorcraft_geom::Rect::new(20.0, 30.0, 80.0, 90.0)), Appearance::default());let mut group = Node::group(NodeId(1), vec![Arc::new(source), Arc::new(art)]);let doc = vectorcraft_doc::Document::new(300.0, 300.0);let symbols = doc.symbol_boxes();@@ -7100,8 +7052,7 @@ fn a_double_click_on_a_threaded_out_port_breaks_the_thread() {let mut app = VectorcraftApp::new(Session::new(), Default::default());app.run("file.new", json!({"width": 600, "height": 400})).unwrap();let text = "Words that fill more than the frame holds. ".repeat(10);- let a =- app.run("text.create", json!({"x": 20, "y": 20, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();+ let a = app.run("text.create", json!({"x": 20, "y": 20, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();app.run("text.thread.add", json!({"from": a, "at": [300, 200]})).unwrap();app.run("select.set", json!({"ids": [a]})).unwrap();app.select_tool("selection");diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rsindex bd6ab4717..8a340d9f5 100644--- a/crates/ui-egui/src/chrome/tests.rs+++ b/crates/ui-egui/src/chrome/tests.rs@@ -421,12 +421,8 @@ fn the_artboard_navigator_goes_to_artboards_and_fitting_shows_the_current_one()let buttons = navigator(&mut app, &ctx, vec![]);assert_eq!(buttons.len(), 4);let click = |app: &mut crate::VectorcraftApp, r: egui::Rect| {- let b = |pressed| egui::Event::PointerButton {- pos: r.center(),- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let b =+ |pressed| egui::Event::PointerButton { pos: r.center(), button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };navigator(app, &ctx, vec![egui::Event::PointerMoved(r.center())]);navigator(app, &ctx, vec![b(true)]);navigator(app, &ctx, vec![b(false)]);@@ -494,8 +490,7 @@ fn status_texts(app: &mut crate::VectorcraftApp, ctx: &egui::Context, events: Ve/// position, document, selection or either branch of its edit history.fn assert_status_coordinates(app: &mut crate::VectorcraftApp, expected: Option<&str>) {let hover = app.hover_doc;- let before =- app.session.active().map(|st| (st.doc.clone(), st.selection.clone(), st.history.undo.len(), st.history.redo.len(), st.is_dirty()));+ let before = app.session.active().map(|st| (st.doc.clone(), st.selection.clone(), st.history.undo.len(), st.history.redo.len(), st.is_dirty()));let ctx = egui::Context::default();crate::theme::install_fonts(&ctx);let texts = status_texts(app, &ctx, vec![]);@@ -504,8 +499,7 @@ fn assert_status_coordinates(app: &mut crate::VectorcraftApp, expected: Option<&let expected: Vec<&str> = expected.into_iter().flat_map(|text| text.split(" ")).collect();assert_eq!(coordinates, expected, "{texts:?}");assert_eq!(app.hover_doc, hover, "tools still receive the absolute document position");- let after =- app.session.active().map(|st| (st.doc.clone(), st.selection.clone(), st.history.undo.len(), st.history.redo.len(), st.is_dirty()));+ let after = app.session.active().map(|st| (st.doc.clone(), st.selection.clone(), st.history.undo.len(), st.history.redo.len(), st.is_dirty()));assert_eq!(after, before, "painting is read-only");}@@ -698,11 +692,7 @@ fn artboard_navigation_next(app: &mut crate::VectorcraftApp, ctx: &egui::Context}}-fn artboard_navigation_properties_frame(- app: &mut crate::VectorcraftApp,- ctx: &egui::Context,- events: Vec<egui::Event>,-) -> Vec<(String, egui::Rect)> {+fn artboard_navigation_properties_frame(app: &mut crate::VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 700.0));let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), events, ..Default::default() }, |ui| {egui::Panel::right("navigation-properties").exact_size(300.0).show(ui, |ui| crate::panels::properties::show(app, ui));@@ -911,12 +901,8 @@ fn the_control_bar_isolates_the_selected_object_and_exits_isolation_mode() {crate::theme::install_fonts(&ctx);let click = |app: &mut crate::VectorcraftApp| {let r = isolation_button(app, &ctx, vec![]).expect("the bar shows the isolation button");- let press = |pressed| egui::Event::PointerButton {- pos: r.center(),- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let press =+ |pressed| egui::Event::PointerButton { pos: r.center(), button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };for e in [egui::Event::PointerMoved(r.center()), press(true), press(false)] {isolation_button(app, &ctx, vec![e]);}diff --git a/crates/ui-egui/src/control/tests.rs b/crates/ui-egui/src/control/tests.rsindex 61c9193ad..f24c958c4 100644--- a/crates/ui-egui/src/control/tests.rs+++ b/crates/ui-egui/src/control/tests.rs@@ -41,9 +41,7 @@ fn the_image_trace_preview_is_a_command() {#[test]fn control_input_rejects_excessive_counts_before_mutation() {// Only modest over-limit values on the baseline: never exercise an unbounded loop.- for (method, params) in- [("ui.click", json!({"count": 17})), ("ui.drag", json!({"steps": 257})), ("ui.drag", json!({"steps": 2, "count": 17}))]- {+ for (method, params) in [("ui.click", json!({"count": 17})), ("ui.drag", json!({"steps": 257})), ("ui.drag", json!({"steps": 2, "count": 17}))] {let mut app = VectorcraftApp::new(Session::new(), Services::default());app.synthetic.push(egui::Event::Text("already queued".into()));let before = format!("{:?}", app.synthetic);@@ -276,8 +274,7 @@ fn dialog_set_refuses_a_field_the_dialog_does_not_have() {assert_eq!(r["ok"], *ok, "{kind} {field}: {r}");}};- let moved =- [("copy", true), ("preview", true), ("distance", true), ("discard", false), ("copies", false), ("corners", false), ("origin", false)];+ let moved = [("copy", true), ("preview", true), ("distance", true), ("discard", false), ("copies", false), ("corners", false), ("origin", false)];set(&mut app, "move", json!({"dx": "0 pt", "dy": "0 pt"}), &moved);set(&mut app,diff --git a/crates/ui-egui/src/dialogs/brush_options/tests.rs b/crates/ui-egui/src/dialogs/brush_options/tests.rsindex c8f612119..7ca4b316c 100644--- a/crates/ui-egui/src/dialogs/brush_options/tests.rs+++ b/crates/ui-egui/src/dialogs/brush_options/tests.rs@@ -206,10 +206,7 @@ fn art_options_set_width_scale_direction_flips_and_colorization() {(d.f64("width", 0.0), d.str("scaleMode"), d.f64("guideEnd", 0.0), d.str("direction")),(100.0, "betweenGuides".into(), 78.0, "leftToRight".into()));- set(- &mut app,- json!({"width": 250, "guideStart": 10, "guideEnd": 140, "direction": "bottomToTop", "flipAcross": true, "colorization": "none"}),- );+ set(&mut app, json!({"width": 250, "guideStart": 10, "guideEnd": 140, "direction": "bottomToTop", "flipAcross": true, "colorization": "none"}));super::super::confirm(&mut app).unwrap();let def = app.run("brush.get", json!({"name": "Arrow"})).unwrap();assert_eq!(@@ -442,10 +439,7 @@ fn pattern_options_show_the_tiles_and_set_scale_spacing_fit() {set(&mut app, json!({"scale": 200, "spacing": 30, "fit": "approximate", "flipAlong": true}));super::super::confirm(&mut app).unwrap();let def = app.run("brush.get", json!({"name": "Diamonds"})).unwrap();- assert_eq!(- (&def["scale"], &def["spacing"], &def["fit"], &def["flip_along"]),- (&json!(200.0), &json!(30.0), &json!("approximate"), &json!(true))- );+ assert_eq!((&def["scale"], &def["spacing"], &def["fit"], &def["flip_along"]), (&json!(200.0), &json!(30.0), &json!("approximate"), &json!(true)));assert!((drawn_height(&app, id) / before - 2.0).abs() < 1e-6, "tiles twice the size");}diff --git a/crates/ui-egui/src/dialogs/color_picker/tests.rs b/crates/ui-egui/src/dialogs/color_picker/tests.rsindex 62187a89a..cc650978b 100644--- a/crates/ui-egui/src/dialogs/color_picker/tests.rs+++ b/crates/ui-egui/src/dialogs/color_picker/tests.rs@@ -371,8 +371,7 @@ impl Drawn {/// Runs a dialog frame with real egui input at a physical window size, accounting for UI zoom,/// and returns the painted controls for layout and interaction assertions.fn draw(ctx: &egui::Context, app: &mut VectorcraftApp, size: egui::Vec2, events: Vec<egui::Event>) -> Drawn {- let input =- egui::RawInput { screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, size / ctx.zoom_factor())), events, ..Default::default() };+ let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, size / ctx.zoom_factor())), events, ..Default::default() };let mut out = ctx.run_ui(input, |ui| {crate::shortcuts::handle(app, ui.ctx());super::super::show(app, ui.ctx());@@ -502,10 +501,7 @@ fn inline_actions_are_aligned_and_modes_keep_the_window_size() {assert!((drawn.control(tl!("Color Models")).width() - ok.width()).abs() < 1.0);let after = ctx.memory(|m| m.area_rect(id)).unwrap();assert!((before.size() - after.size()).length() < 1.0, "{before:?} vs {after:?}");- assert!(- drawn.boxes.iter().all(|r| r.left() >= after.left() - 1.0 && r.right() <= after.right() + 1.0),- "swatch controls fit horizontally"- );+ assert!(drawn.boxes.iter().all(|r| r.left() >= after.left() - 1.0 && r.right() <= after.right() + 1.0), "swatch controls fit horizontally");click_at(&ctx, &mut app, drawn.text(tl!("Color Models")).center());assert!(!app.ui.dialog.as_ref().unwrap().bool("swatches"));}@@ -552,12 +548,8 @@ fn warnings_fit_below_the_preview_without_widening_the_dialog() {let ok = drawn.control(tl!("OK"));let toggle = drawn.control(tl!("Color Swatches"));let h = drawn.text("H");- let mut warnings: Vec<_> = drawn- .boxes- .iter()- .filter(|r| (r.width() - 16.0).abs() < 0.5 && (r.height() - 16.0).abs() < 0.5 && r.bottom() < h.top())- .copied()- .collect();+ let mut warnings: Vec<_> =+ drawn.boxes.iter().filter(|r| (r.width() - 16.0).abs() < 0.5 && (r.height() - 16.0).abs() < 0.5 && r.bottom() < h.top()).copied().collect();warnings.dedup(); // The tile's fill and border share one rectangle.assert_eq!(warnings.len(), 2, "gamut and web correction chips are both present");for r in &warnings {diff --git a/crates/ui-egui/src/dialogs/find_links/tests.rs b/crates/ui-egui/src/dialogs/find_links/tests.rsindex fe8f38240..6db57091f 100644--- a/crates/ui-egui/src/dialogs/find_links/tests.rs+++ b/crates/ui-egui/src/dialogs/find_links/tests.rs@@ -108,8 +108,7 @@ fn find_in_folder_relinks_the_missing_files_to_the_files_found() {let d = app.ui.dialog.as_ref().unwrap();assert_eq!((d.str("state"), pick(d, "a.png"), pick(d, "b.png")), ("done".to_string(), &json!(a), &json!(b)));let text = frame(&mut app);- for label in- ["Find Linked Files", "a.png", "b.png", "Same file", "Don't Relink", "Find in Folder…", "Copy into the document's folder", "Relink"]+ for label in ["Find Linked Files", "a.png", "b.png", "Same file", "Don't Relink", "Find in Folder…", "Copy into the document's folder", "Relink"]{assert!(text.contains(label), "{label} in {text}");}diff --git a/crates/ui-egui/src/dialogs/freehand/tests.rs b/crates/ui-egui/src/dialogs/freehand/tests.rsindex 1ef9ff49c..40db4a3eb 100644--- a/crates/ui-egui/src/dialogs/freehand/tests.rs+++ b/crates/ui-egui/src/dialogs/freehand/tests.rs@@ -39,15 +39,9 @@ fn the_fidelity_keys_step_finely_at_the_low_end() {assert_eq!(down, up.iter().rev().copied().collect::<Vec<_>>());// Ten steps at once (Shift) multiply or divide by ten.assert_eq!((fidelity_step(0.01, 10.0), fidelity_step(0.1, 10.0), fidelity_step(1.0, 10.0)), (0.1, 1.0, 10.0));- assert_eq!(- (fidelity_step(10.0, -10.0), fidelity_step(1.0, -10.0), fidelity_step(0.1, -10.0), fidelity_step(0.03, 10.0)),- (1.0, 0.1, 0.01, 0.3)- );+ assert_eq!((fidelity_step(10.0, -10.0), fidelity_step(1.0, -10.0), fidelity_step(0.1, -10.0), fidelity_step(0.03, 10.0)), (1.0, 0.1, 0.01, 0.3));// A value between steps goes to the next one in its direction.- assert_eq!(- (fidelity_step(0.035, 1.0), fidelity_step(0.035, -1.0), fidelity_step(1.5, 1.0), fidelity_step(1.5, -1.0)),- (0.04, 0.03, 2.0, 1.0)- );+ assert_eq!((fidelity_step(0.035, 1.0), fidelity_step(0.035, -1.0), fidelity_step(1.5, 1.0), fidelity_step(1.5, -1.0)), (0.04, 0.03, 2.0, 1.0));}#[test]@@ -86,8 +80,7 @@ fn each_tool_shows_its_options_and_ok_sets_them() {(d.f64("fidelity", 0.0), d.bool("fill"), d.bool("altSmooth"), d.f64("closeWithin", 0.0), d.f64("editWithin", 0.0)),(1.5, false, false, 15.0, 12.0));- for (k, v) in- [("fidelity", json!(6.5)), ("fill", json!(true)), ("altSmooth", json!(true)), ("closeWithin", json!(0)), ("editWithin", json!(20))]+ for (k, v) in [("fidelity", json!(6.5)), ("fill", json!(true)), ("altSmooth", json!(true)), ("closeWithin", json!(0)), ("editWithin", json!(20))]{d.fields.insert(k.into(), v);}diff --git a/crates/ui-egui/src/dialogs/missing_fonts/tests.rs b/crates/ui-egui/src/dialogs/missing_fonts/tests.rsindex d22bd372d..2dbfdf810 100644--- a/crates/ui-egui/src/dialogs/missing_fonts/tests.rs+++ b/crates/ui-egui/src/dialogs/missing_fonts/tests.rs@@ -239,8 +239,7 @@ fn the_question_comes_back_after_a_dialog_that_took_its_place() {vectorcraft_testkit::pdf::pdf(&[page(), page()], None)};let opened = |name: &str, path: Option<String>, bytes: Vec<u8>| (crate::place::DropTarget::Open, (name.to_string(), path, bytes));- let files =- vec![opened("a.vectorcraft", Some(doc.to_string_lossy().into_owned()), std::fs::read(&doc).unwrap()), opened("b.pdf", None, pdf())];+ let files = vec![opened("a.vectorcraft", Some(doc.to_string_lossy().into_owned()), std::fs::read(&doc).unwrap()), opened("b.pdf", None, pdf())];crate::place::drop_files(&mut app, files);assert_eq!(kind(&app), Some(super::super::import_pdf::KIND));super::super::cancel(&mut app);diff --git a/crates/ui-egui/src/dialogs/width_point/tests.rs b/crates/ui-egui/src/dialogs/width_point/tests.rsindex 536c558cf..f8b686cca 100644--- a/crates/ui-egui/src/dialogs/width_point/tests.rs+++ b/crates/ui-egui/src/dialogs/width_point/tests.rs@@ -309,8 +309,7 @@ fn creation_dialog_frame(app: &mut VectorcraftApp, ctx: &egui::Context, events:_ => {}}}- let input =- egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1000.0, 700.0))), events, ..Default::default() };+ let input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1000.0, 700.0))), events, ..Default::default() };let mut output = ctx.run_ui(input, |ui| super::super::show(app, ui.ctx()));output.textures_delta.clear();let mut texts = vec![];diff --git a/crates/ui-egui/src/font_menu/tests.rs b/crates/ui-egui/src/font_menu/tests.rsindex 1f45627f7..4fdfc5733 100644--- a/crates/ui-egui/src/font_menu/tests.rs+++ b/crates/ui-egui/src/font_menu/tests.rs@@ -95,11 +95,8 @@ fn recent_section_rebuilds_and_arrows_skip_its_headings() {let mut st = super::MenuState::default();let mut frame = |events, recent: &[String]| {let mut picked = None;- let input = egui::RawInput {- events,- screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))),- ..Default::default()- };+ let input =+ egui::RawInput { events, screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))), ..Default::default() };let mut out = ctx.run_ui(input, |ui| {picked = super::list(ui,@@ -149,11 +146,7 @@ fn recent_fonts_obey_search_and_favorite_filters() {let mut frame = |events| {let mut pick = None;let mut out = ctx.run_ui(- egui::RawInput {- events,- screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))),- ..Default::default()- },+ egui::RawInput { events, screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))), ..Default::default() },|ui| {pick = super::list(ui,@@ -256,11 +249,7 @@ fn the_variable_filter_lists_only_variable_families() {let mut favorites: Vec<String> = vec![];let frame = |st: &mut super::MenuState, events, favorites: &[String]| {let mut out = ctx.run_ui(- egui::RawInput {- events,- screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))),- ..Default::default()- },+ egui::RawInput { events, screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 800.0))), ..Default::default() },|ui| {super::list(ui,@@ -291,8 +280,7 @@ fn the_variable_filter_lists_only_variable_families() {let click = |st: &mut super::MenuState, favorites: &[String]| {let (_, at) = frame(st, vec![], favorites);let at = at.expect("the Variable filter is drawn");- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(st, vec![egui::Event::PointerMoved(at), button(true)], favorites);frame(st, vec![button(false)], favorites);frame(st, vec![], favorites).0diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rsindex e141965bb..f3ef8ee0d 100644--- a/crates/ui-egui/src/i18n.rs+++ b/crates/ui-egui/src/i18n.rs@@ -108,19 +108,35 @@ pub static LANGUAGES: [LangInfo; 25] = [},// Japanese: the whole interface (every menu string and `tl!` literal) and the status and error// messages, keeping the product, workspace and perspective preset names in English (`MENU_KEEP_AS_IS`).- LangInfo { code: "ja", name: "日本語", source: include_str!("i18n/ja.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "ja", name: "日本語", source: include_str!("i18n/ja.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()+ },// Korean: the whole interface and the status and error messages, keeping the same names in// English as Japanese; a count takes no plural, so plurals have one form. Hangul is drawn with an// installed system font (craft-fonts has no Korean UI face yet); every `ko-*` locale resolves here.- LangInfo { code: "ko", name: "한국어", source: include_str!("i18n/ko.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "ko", name: "한국어", source: include_str!("i18n/ko.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()+ },// Vietnamese: complete menus and messages, with one plural form.// Every `vi-*` locale resolves here.LangInfo {- code: "vi", name: "Tiếng Việt", source: include_str!("i18n/vi.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()+ code: "vi",+ name: "Tiếng Việt",+ source: include_str!("i18n/vi.tsv"),+ plural: plural_none,+ complete_menus: true,+ catalog: OnceLock::new(),},// Czech: the whole interface (every menu string and `tl!` literal) and the status and error// messages, with one/few/other plurals, keeping the same names in English as Spanish.- LangInfo { code: "cs", name: "Čeština", source: include_str!("i18n/cs.tsv"), plural: plural_czech, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "cs",+ name: "Čeština",+ source: include_str!("i18n/cs.tsv"),+ plural: plural_czech,+ complete_menus: true,+ catalog: OnceLock::new(),+ },// German: the whole interface and the status and error messages, keeping the same names in// English as Spanish; every `de-*` locale (`de-DE`, `de-AT`, `de-CH`, `de-LU` …) resolves here.LangInfo {@@ -143,7 +159,14 @@ pub static LANGUAGES: [LangInfo; 25] = [},// French: the whole interface and the status and error messages, keeping the same names in// English as Spanish; every `fr-*` locale (`fr-FR`, `fr-BE`, `fr-CA`, `fr-CH` …) resolves here.- LangInfo { code: "fr", name: "Français", source: include_str!("i18n/fr.tsv"), plural: plural_french, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "fr",+ name: "Français",+ source: include_str!("i18n/fr.tsv"),+ plural: plural_french,+ complete_menus: true,+ catalog: OnceLock::new(),+ },// Italian: the whole interface and the status and error messages, keeping the same names in// English as Spanish; every `it-*` locale (`it-IT`, `it-CH`, `it-SM` …) resolves here.LangInfo {@@ -158,7 +181,12 @@ pub static LANGUAGES: [LangInfo; 25] = [// English as Spanish. Georgian nouns stay singular after a number, so one plural form;// `ka-GE` and `ka_GE.UTF-8` resolve here.LangInfo {- code: "ka", name: "ქართული", source: include_str!("i18n/ka.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()+ code: "ka",+ name: "ქართული",+ source: include_str!("i18n/ka.tsv"),+ plural: plural_none,+ complete_menus: true,+ catalog: OnceLock::new(),},// Russian: the whole interface and the status and error messages, keeping the same names in// English as Spanish; every `ru-*` locale (`ru-RU`, `ru-BY`, `ru-KZ` …) resolves here.@@ -197,7 +225,14 @@ pub static LANGUAGES: [LangInfo; 25] = [// Polish: the whole interface and the status and error messages, with one/few/many plurals,// keeping the same names in English as Spanish; every `pl-*` locale (including `pl-PL`)// resolves here.- LangInfo { code: "pl", name: "Polski", source: include_str!("i18n/pl.tsv"), plural: plural_polish, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "pl",+ name: "Polski",+ source: include_str!("i18n/pl.tsv"),+ plural: plural_polish,+ complete_menus: true,+ catalog: OnceLock::new(),+ },// Swedish: the whole interface and the status and error messages, keeping the same names in// English as Spanish; every `sv-*` locale (`sv-SE`, `sv-FI` …) resolves here.LangInfo {@@ -248,7 +283,14 @@ pub static LANGUAGES: [LangInfo; 25] = [catalog: OnceLock::new(),},// Danish; every `da-*` locale (`da-DK`, `da_DK.UTF-8`…) resolves here.- LangInfo { code: "da", name: "Dansk", source: include_str!("i18n/da.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "da",+ name: "Dansk",+ source: include_str!("i18n/da.tsv"),+ plural: plural_one_other,+ complete_menus: true,+ catalog: OnceLock::new(),+ },// Indonesian; every `id-*` locale (`id-ID`, `id_ID.UTF-8`…) resolves here. CLDR `id` counts// have one form, so `@plural` entries list a single form.LangInfo {@@ -262,11 +304,20 @@ pub static LANGUAGES: [LangInfo; 25] = [// Finnish: the whole interface and the status and error messages, keeping the same names in// English as Spanish; one/other plurals with the partitive after any number but 1 ("2 tasoa").// Every `fi-*` locale resolves here.- LangInfo { code: "fi", name: "Suomi", source: include_str!("i18n/fi.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "fi",+ name: "Suomi",+ source: include_str!("i18n/fi.tsv"),+ plural: plural_one_other,+ complete_menus: true,+ catalog: OnceLock::new(),+ },// Turkish: the whole interface and the status and error messages, keeping the same names in// English as Spanish; a count takes the singular ("3 katman"), so plurals have one form. Every// `tr-*` locale (including `tr-TR` and `tr-CY`) resolves here.- LangInfo { code: "tr", name: "Türkçe", source: include_str!("i18n/tr.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },+ LangInfo {+ code: "tr", name: "Türkçe", source: include_str!("i18n/tr.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()+ },];impl LangInfo {diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rsindex 1e1c1c4b8..f168c83e0 100644--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@ -73,7 +73,10 @@ pub mod workspaces;mod document_drag;#[cfg(test)]-use tests::{background as tests_background, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors, svg as tests_svg, synthetic as tests_synthetic, sysclip as tests_sysclip};+use tests::{+ background as tests_background, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors, svg as tests_svg,+ synthetic as tests_synthetic, sysclip as tests_sysclip,+};#[cfg(test)]mod tests;diff --git a/crates/ui-egui/src/menus/tests.rs b/crates/ui-egui/src/menus/tests.rsindex b78f5efdb..f4baafa1d 100644--- a/crates/ui-egui/src/menus/tests.rs+++ b/crates/ui-egui/src/menus/tests.rs@@ -114,8 +114,7 @@ fn a_popup_covering_a_title_does_not_switch_menus() {let mut reaches = (true, false);// The popup becomes hit-testable once egui has laid it out: draw a few frames.for _ in 0..3 {- let raw =- egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(300.0, 200.0))), ..Default::default() };+ let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(300.0, 200.0))), ..Default::default() };let mut out = ctx.run_ui(raw, |ui| {let ctx = ui.ctx().clone();let covered = ui.interact(egui::Rect::from_center_size(p, egui::vec2(80.0, 24.0)), egui::Id::unique("covered"), egui::Sense::click());diff --git a/crates/ui-egui/src/panels/appearance/tests.rs b/crates/ui-egui/src/panels/appearance/tests.rsindex 982de7443..5df314659 100644--- a/crates/ui-egui/src/panels/appearance/tests.rs+++ b/crates/ui-egui/src/panels/appearance/tests.rs@@ -427,8 +427,7 @@ fn groups_show_a_contents_row_and_type_a_characters_row_in_their_slot() {run(&mut app, "object.group", json!({}));run(&mut app, "appearance.addFill", json!({}));run(&mut app, "appearance.addStroke", json!({}));- let rows =- |t: Vec<String>| t.into_iter().filter(|t| ["Fill:", "Stroke:", "Contents", "Characters"].contains(&t.as_str())).collect::<Vec<_>>();+ let rows = |t: Vec<String>| t.into_iter().filter(|t| ["Fill:", "Stroke:", "Contents", "Characters"].contains(&t.as_str())).collect::<Vec<_>>();assert_eq!(rows(frame(&mut app)), ["Stroke:", "Fill:", "Contents"]);run(&mut app, "appearance.moveItem", json!({"from": "contents", "to": 1}));assert_eq!(rows(frame(&mut app)), ["Stroke:", "Contents", "Fill:"]);@@ -446,9 +445,7 @@ fn images_show_a_contents_row_with_new_fills_and_strokes_below_it() {run(&mut app, "file.new", json!({"width": 100, "height": 100}));let rows = |t: Vec<String>| t.into_iter().filter(|t| ["Fill:", "Stroke:", "Contents"].contains(&t.as_str())).collect::<Vec<_>>();let mut png = vec![];- image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255]))- .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)- .unwrap();+ image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();run(&mut app, "file.place", json!({"name": "red.png", "dataBase64": vectorcraft_format::base64_encode(&png)}));assert_eq!(rows(frame(&mut app)), ["Contents"]);run(&mut app, "appearance.addStroke", json!({}));diff --git a/crates/ui-egui/src/panels/artboards/tests.rs b/crates/ui-egui/src/panels/artboards/tests.rsindex e0edc9a17..15bab000b 100644--- a/crates/ui-egui/src/panels/artboards/tests.rs+++ b/crates/ui-egui/src/panels/artboards/tests.rs@@ -195,8 +195,7 @@ fn double_clicks_go_to_or_rename_and_options_edits_the_rows_artboard() {}).unwrap();let events = |at: egui::Pos2, clicks: usize| {- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };std::iter::once(egui::Event::PointerMoved(at)).chain((0..clicks).flat_map(|_| [button(true), button(false)])).collect::<Vec<_>>()};// Artboard 2's number: it is active, no rename starts.@@ -285,8 +284,7 @@ fn the_panel_menus_rename_numbers_several_selected_artboards() {_ => None,}).unwrap();- let button =- |pressed| egui::Event::PointerButton { pos: item, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: item, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };ctx.run_ui(raw(vec![egui::Event::PointerMoved(item), button(true), button(false)]), |ui| menu(app, ui)).textures_delta.clear();};let frame = |app: &mut VectorcraftApp, events| ctx.run_ui(raw(events), |ui| show(app, ui)).textures_delta.clear();@@ -530,8 +528,7 @@ fn the_options_icon_opens_artboard_options_for_its_rows_artboard() {.unwrap();let icon = |k: f32| egui::pos2(row.right() - 14.0, row.center().y + 24.0 * k);let events = |at: egui::Pos2, clicks: usize| {- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };std::iter::once(egui::Event::PointerMoved(at)).chain((0..clicks).flat_map(|_| [button(true), button(false)])).collect::<Vec<_>>()};let opened = |app: &mut VectorcraftApp| app.ui.dialog.take().map(|d| (d.kind.clone(), d.f64("index", 9.0), d.f64("width", 0.0)));@@ -680,8 +677,7 @@ fn bar_frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Ev/// [`bar_frame`] in a window `width` points wide.fn bar_frame_in(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Event>, width: f32) -> Vec<(String, egui::Rect)> {let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(width, 300.0));- let mut out =- ctx.run_ui(egui::RawInput { screen_rect: Some(screen), events, ..Default::default() }, |ui| crate::chrome::control_bar(app, ui));+ let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), events, ..Default::default() }, |ui| crate::chrome::control_bar(app, ui));out.textures_delta.clear();out.shapes.iter()@@ -806,12 +802,8 @@ fn the_control_bar_shows_the_artboard_tools_controls() {assert_eq!(boxes.len(), 2, "{boxes:?}");let scale = |app: &VectorcraftApp| app.session.tool_options()["scaleArt"].as_bool();assert_eq!(scale(&app), Some(false));- let press = |pressed| egui::Event::PointerButton {- pos: boxes[1].center(),- button: egui::PointerButton::Primary,- pressed,- modifiers: Default::default(),- };+ let press =+ |pressed| egui::Event::PointerButton { pos: boxes[1].center(), button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };narrow(&mut app, vec![egui::Event::PointerMoved(boxes[1].center()), press(true)]);narrow(&mut app, vec![press(false)]);assert_eq!(scale(&app), Some(true));@@ -918,8 +910,7 @@ fn the_control_bar_adds_deletes_and_opens_artboard_dialogs() {// Artboard Options and Rearrange All Artboards: the two buttons between the name and the// Transform link.let texts = bar_texts(&mut app, &ctx);- let between =- |texts: &[(String, egui::Rect)]| bar_buttons(&ctx, text_rect(texts, "Artboard 2").right(), text_rect(texts, "Transform").left());+ let between = |texts: &[(String, egui::Rect)]| bar_buttons(&ctx, text_rect(texts, "Artboard 2").right(), text_rect(texts, "Transform").left());let options = between(&texts)[0];bar_click(&mut app, &ctx, options.center());let d = app.ui.dialog.take().unwrap();@@ -992,8 +983,7 @@ fn dragging_a_row_onto_new_artboard_duplicates_it() {// The bottom bar's buttons sit under its divider, New Artboard second from the right.let bar = rect_of(t.divider).unwrap();let new = pos2(bar.right() - 24.0 - 4.0 - 12.0, bar.bottom() + 2.0 + 12.0);- let button =- |at, pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |at, pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };frame(&mut app, vec![egui::Event::PointerMoved(row), button(row, true)]);frame(&mut app, vec![egui::Event::PointerMoved(row + vec2(0.0, 12.0))]);let held = frame(&mut app, vec![egui::Event::PointerMoved(new)]);diff --git a/crates/ui-egui/src/panels/brushes/tests.rs b/crates/ui-egui/src/panels/brushes/tests.rsindex 35fa11aaa..47fc962c6 100644--- a/crates/ui-egui/src/panels/brushes/tests.rs+++ b/crates/ui-egui/src/panels/brushes/tests.rs@@ -79,12 +79,8 @@ fn double_clicking_a_brush_opens_its_options() {std::iter::once(egui::Event::PointerMoved(at)).chain((0..n).flat_map(|_| [button(at, true), button(at, false)])).collect()};let at_time = |app: &mut VectorcraftApp, time: f64, events: Vec<egui::Event>| {- let raw = egui::RawInput {- screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(236.0, 600.0))),- time: Some(time),- events,- ..Default::default()- };+ let raw =+ egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(236.0, 600.0))), time: Some(time), events, ..Default::default() };ctx.run_ui(raw, |ui| show(app, ui)).textures_delta.clear();};at_time(&mut app, 0.0, vec![]);@@ -443,8 +439,7 @@ fn previews_render_again_only_when_what_they_show_changes() {// Striped Ribbon brings its pattern, Sparkles its symbol: only they render.app.run("brush.addFromLibrary", json!({"library": "art-ribbons", "name": "Striped Ribbon"})).unwrap();assert_eq!(counted(&ctx, &mut app), (1, n + 1));- let symbol_key =- |app: &VectorcraftApp, name: &str| super::super::symbols::document_symbols(app.session.active().unwrap()).key(name).unwrap_or(0);+ let symbol_key = |app: &VectorcraftApp, name: &str| super::super::symbols::document_symbols(app.session.active().unwrap()).key(name).unwrap_or(0);let sparkle_before = symbol_key(&app, "Sparkle");app.run("brush.addFromLibrary", json!({"library": "scatter-shapes", "name": "Sparkles"})).unwrap();assert_eq!(counted(&ctx, &mut app), (1, n + 2));@@ -458,11 +453,8 @@ fn previews_render_again_only_when_what_they_show_changes() {app.session.edit("Pattern", |d, _| {let p = d.patterns.iter_mut().find(|p| p.name == "Pinstripes").unwrap();- let dot = Node::path(- NodeId(0),- vectorcraft_geom::shapes::ellipse(vectorcraft_geom::Rect::new(0.0, 0.0, 3.0, 3.0)),- Appearance::default_art(),- );+ let dot =+ Node::path(NodeId(0), vectorcraft_geom::shapes::ellipse(vectorcraft_geom::Rect::new(0.0, 0.0, 3.0, 3.0)), Appearance::default_art());p.art = vec![std::sync::Arc::new(dot)];Ok(())})diff --git a/crates/ui-egui/src/panels/color/tests.rs b/crates/ui-egui/src/panels/color/tests.rsindex 8d89d498b..46051b7a9 100644--- a/crates/ui-egui/src/panels/color/tests.rs+++ b/crates/ui-egui/src/panels/color/tests.rs@@ -99,8 +99,7 @@ fn menu_frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Efn click_menu_item(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) {let labels = menu_frame(app, ctx, vec![]);let at = labels.iter().find(|(t, _)| t.trim() == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no {label} in the menu"));- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };menu_frame(app, ctx, vec![egui::Event::PointerMoved(at), button(true)]);menu_frame(app, ctx, vec![button(false)]);}diff --git a/crates/ui-egui/src/panels/gradient/tests.rs b/crates/ui-egui/src/panels/gradient/tests.rsindex a4dac7825..31bcb69a6 100644--- a/crates/ui-egui/src/panels/gradient/tests.rs+++ b/crates/ui-egui/src/panels/gradient/tests.rs@@ -55,9 +55,7 @@ fn a_gradient_saved_as_a_swatch_keeps_its_stops_models_in_a_cmyk_document() {let colors = |g: &GradientPaint| g.gradient.stops.iter().map(|s| s.color).collect::<Vec<_>>();assert_eq!(colors(&g), [Color::rgb8(255, 128, 0), Color::cmyk(0.0, 0.0, 0.0, 1.0)]);save_to_swatches(&mut app, &g);- let Some(Paint::Gradient(saved)) = app.session.doc().unwrap().doc.swatches.last().map(|w| w.paint.clone()) else {- panic!("a gradient swatch")- };+ let Some(Paint::Gradient(saved)) = app.session.doc().unwrap().doc.swatches.last().map(|w| w.paint.clone()) else { panic!("a gradient swatch") };assert_eq!(colors(&saved), colors(&g));}@@ -150,9 +148,7 @@ impl Panel {.layers().flat_map(|(_, w)| w.iter()).map(|w| w.rect)- .filter(|r| {- (r.width() - size).abs() < 0.5 && (r.height() - size).abs() < 0.5 && (r.center().y - at.y).abs() < 8.0 && r.left() > at.x- })+ .filter(|r| (r.width() - size).abs() < 0.5 && (r.height() - size).abs() < 0.5 && (r.center().y - at.y).abs() < 8.0 && r.left() > at.x).collect()});v.sort_by(|a, b| a.left().total_cmp(&b.left()));@@ -405,10 +401,7 @@ fn double_clicking_a_stop_opens_the_shared_popover_beside_it() {let b = |pressed| Event::PointerButton { pos: stop.center(), button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE };p.frame(&mut app, vec![Event::PointerMoved(stop.center()), b(true), b(false), b(true), b(false)], Modifiers::NONE);let d = app.ui.dialog.clone().expect("the popover opened");- assert_eq!(- (d.kind.as_str(), &d.fields["index"], &d.fields["screen"]),- ("gradientStop", &json!(1), &json!([stop.left(), stop.bottom() + 4.0]))- );+ assert_eq!((d.kind.as_str(), &d.fields["index"], &d.fields["screen"]), ("gradientStop", &json!(1), &json!([stop.left(), stop.bottom() + 4.0])));assert_eq!(app.session.selected_stop(), Some(1));}diff --git a/crates/ui-egui/src/panels/image_trace/tests.rs b/crates/ui-egui/src/panels/image_trace/tests.rsindex d388c0e15..268c3ab17 100644--- a/crates/ui-egui/src/panels/image_trace/tests.rs+++ b/crates/ui-egui/src/panels/image_trace/tests.rs@@ -150,10 +150,7 @@ fn adjusting_sketch_threshold_changes_the_vector_result_and_can_be_undone() {frame(&mut app,&ctx,- vec![- Event::PointerMoved(at),- Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() },- ],+ vec![Event::PointerMoved(at), Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }],);}assert_eq!(first_selected(&app).unwrap().children().unwrap().len(), 1, "only the source remains below the ink's luminance");@@ -180,10 +177,7 @@ fn with_preview_off_a_slider_change_waits_for_trace() {frame(&mut app,&ctx,- vec![- Event::PointerMoved(at),- Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() },- ],+ vec![Event::PointerMoved(at), Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }],);}assert_eq!(app.session.active().unwrap().history.undo.len(), steps, "no trace while Preview is off");@@ -381,10 +375,7 @@ fn preview_is_kept_with_the_preferences_and_reset_to_default_leaves_it() {for pressed in [true, false] {menu_frame(&mut app,- vec![- Event::PointerMoved(at),- Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() },- ],+ vec![Event::PointerMoved(at), Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }],);}assert!(pstate::<TraceUi>(&ctx, "image-trace").params.is_null(), "the panel's settings were reset");@@ -569,10 +560,8 @@ fn properties_can_reopen_the_trace_controls() {}let at = at.unwrap();for pressed in [true, false] {- let events = vec![- Event::PointerMoved(at),- Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() },- ];+ let events =+ vec![Event::PointerMoved(at), Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }];let mut out = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| super::super::properties::show(&mut app, ui));out.textures_delta.clear();}diff --git a/crates/ui-egui/src/panels/layers/tests.rs b/crates/ui-egui/src/panels/layers/tests.rsindex 7df8a486e..e779e328c 100644--- a/crates/ui-egui/src/panels/layers/tests.rs+++ b/crates/ui-egui/src/panels/layers/tests.rs@@ -323,8 +323,7 @@ fn renaming_a_layer_commits_on_enter_and_escape_cancels() {let name = |app: &VectorcraftApp| app.session.doc().unwrap().doc.layers[0].display_name();let ctx = egui::Context::default();let key = |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };- let select_all =- egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND };+ let select_all = egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND };// What a double-click on the row does: the name field opens with the name.let open = |app: &mut VectorcraftApp| {ctx.data_mut(|d| d.insert_temp(egui::Id::unique("layers-rename"), (layer.0, name(app))));@@ -436,8 +435,7 @@ fn nested() -> (VectorcraftApp, [NodeId; 6]) {/// Press and release at `at` with `mods` held, over three frames.fn click_with(app: &mut VectorcraftApp, ctx: &egui::Context, at: egui::Pos2, mods: egui::Modifiers) {for e in [egui::Event::PointerMoved(at), button(at, true), button(at, false)] {- let mut out =- ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(mods), e], ..Default::default() }, |ui| show(app, ui));+ let mut out = ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(mods), e], ..Default::default() }, |ui| show(app, ui));out.textures_delta.clear();}}diff --git a/crates/ui-egui/src/panels/library_panel/tests.rs b/crates/ui-egui/src/panels/library_panel/tests.rsindex ac01d4f44..9e1db24a8 100644--- a/crates/ui-egui/src/panels/library_panel/tests.rs+++ b/crates/ui-egui/src/panels/library_panel/tests.rs@@ -361,12 +361,7 @@ fn accessible() -> egui::Context {}/// One frame of `draw` with `events`, after the frames `ctx` ran.-fn draw_frame(- app: &mut VectorcraftApp,- ctx: &egui::Context,- draw: &dyn Fn(&mut VectorcraftApp, &mut Ui),- events: Vec<Event>,-) -> egui::FullOutput {+fn draw_frame(app: &mut VectorcraftApp, ctx: &egui::Context, draw: &dyn Fn(&mut VectorcraftApp, &mut Ui), events: Vec<Event>) -> egui::FullOutput {let screen_rect = Some(Rect::from_min_size(Pos2::ZERO, vec2(1200.0, 800.0)));let time = Some(ctx.input(|i| i.time) + 0.1);let mut out = ctx.run_ui(egui::RawInput { events, time, screen_rect, ..Default::default() }, |ui| draw(app, ui));diff --git a/crates/ui-egui/src/panels/paragraph/tests.rs b/crates/ui-egui/src/panels/paragraph/tests.rsindex ea8391896..163427da5 100644--- a/crates/ui-egui/src/panels/paragraph/tests.rs+++ b/crates/ui-egui/src/panels/paragraph/tests.rs@@ -142,10 +142,7 @@ fn paragraph_mixed_alignment_click_center_and_undo() {assert_eq!(alignment_frame(&ctx, &mut app, 28.0).0, [Justify::Center]);let node = app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id.as_u64().unwrap())).unwrap();let NodeKind::Text(text) = &node.kind else { panic!("text") };- assert_eq!(- (text.para_at(0).justify, text.para_at(1).justify, text.para_at(2).justify),- (Justify::Center, Justify::Center, Justify::JustifyAll)- );+ assert_eq!((text.para_at(0).justify, text.para_at(1).justify, text.para_at(2).justify), (Justify::Center, Justify::Center, Justify::JustifyAll));let NodeKind::Text(old) = &before.node(node.id).unwrap().kind else { panic!("text") };for i in 0..3 {let mut expected = old.para_at(i).clone();@@ -479,8 +476,7 @@ fn convert_to_text_keeps_the_caret_by_its_character_in_threaded_type() {app.run("file.new", json!({"width": 600, "height": 300})).unwrap();let long = "The quick brown fox jumps over the lazy dog. ".repeat(4);let text = format!("One\nTwo\n{long}\nFour");- let a =- app.run("text.create", json!({"x": 10, "y": 10, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();+ let a = app.run("text.create", json!({"x": 10, "y": 10, "text": text, "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();let b = app.run("shape.rectangle", json!({"x": 200, "y": 10, "width": 150, "height": 200})).unwrap()["id"].as_u64().unwrap();app.run("select.set", json!({"ids": [a, b]})).unwrap();app.run("text.thread.create", json!({})).unwrap();diff --git a/crates/ui-egui/src/panels/properties/tests.rs b/crates/ui-egui/src/panels/properties/tests.rsindex 81286123f..f82c9db91 100644--- a/crates/ui-egui/src/panels/properties/tests.rs+++ b/crates/ui-egui/src/panels/properties/tests.rs@@ -16,11 +16,7 @@ fn panel_frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<Event>out.shapes.iter().filter_map(|s| {- if let egui::Shape::Text(t) = &s.shape {- Some((t.galley.text().to_string(), Rect::from_min_size(t.pos, t.galley.size())))- } else {- None- }+ if let egui::Shape::Text(t) = &s.shape { Some((t.galley.text().to_string(), Rect::from_min_size(t.pos, t.galley.size()))) } else { None }}).collect()}@@ -126,8 +122,7 @@ fn start_global_edit_quick_action_and_escape() {assert!(tall(&mut app, vec![]).iter().any(|(t, _)| t == "Stop Global Edit"));assert_eq!(label(&app), "Stop Global Edit");let escape = Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };- let raw =- egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(300.0, 1600.0))), events: vec![escape], ..Default::default() };+ let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(300.0, 1600.0))), events: vec![escape], ..Default::default() };let mut out = ctx.run_ui(raw, |ui| crate::shortcuts::handle(&mut app, ui.ctx()));out.textures_delta.clear();assert!(!on(&app), "Escape stops Global Edit");@@ -1331,18 +1326,8 @@ fn the_width_profile_shows_for_a_variable_width_or_the_width_tool() {let depth = undo_depth(&app);press(&mut app, &ctx, text_at(&texts, "Taper Start").center());assert_eq!(undo_depth(&app), depth + 1, "one undo step");- let profile = app- .session- .active()- .unwrap()- .doc- .node(vectorcraft_doc::NodeId(line.as_u64().unwrap()))- .unwrap()- .appearance- .stroke()- .unwrap()- .profile- .clone();+ let profile =+ app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(line.as_u64().unwrap())).unwrap().appearance.stroke().unwrap().profile.clone();assert_eq!(WidthProfile::id_of(profile.as_ref()), "taperStart");}diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rsindex 416cd2d76..4175ed0cb 100644--- a/crates/ui-egui/src/panels/swatches/tests.rs+++ b/crates/ui-egui/src/panels/swatches/tests.rs@@ -229,10 +229,7 @@ fn new_swatch_dialog_prefills_the_active_colour_and_saves_into_the_selected_grouapp.run("paint.setFill", json!({"color": "#ff8000"})).unwrap();new_swatch(&mut app, &["Bright Red".into()], Modifiers::COMMAND);let d = app.ui.dialog.as_ref().expect("New Swatch opens its dialog");- assert_eq!(- (d.kind.as_str(), d.str("name").as_str(), d.str("group").as_str()),- (crate::dialogs::new_swatch::KIND, "R=255 G=128 B=0", "Brights")- );+ assert_eq!((d.kind.as_str(), d.str("name").as_str(), d.str("group").as_str()), (crate::dialogs::new_swatch::KIND, "R=255 G=128 B=0", "Brights"));assert!(d.bool("spot") && d.bool("global"), "Cmd/Ctrl-click makes a spot colour");dialog_frame(&mut app, &ctx);crate::dialogs::confirm(&mut app).unwrap();@@ -487,11 +484,7 @@ fn a_proxy_dropped_on_the_panel_becomes_a_swatch() {egui::DragAndDrop::set_payload(&ctx, PanelDrag::paint(Paint::solid(Color::from_hex("#123456").unwrap())));let release = Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE };frame(&mut app, &ctx, vec![Event::PointerMoved(at), release], 1.0, show);- assert_eq!(- names_of(&app, Some("Brights")).last().map(String::as_str),- Some("R=18 G=52 B=86"),- "dropped on a group's colour: into that group"- );+ assert_eq!(names_of(&app, Some("Brights")).last().map(String::as_str), Some("R=18 G=52 B=86"), "dropped on a group's colour: into that group");assert!(egui::DragAndDrop::payload::<PanelDrag>(&ctx).is_none());}@@ -679,9 +672,7 @@ fn deselecting_keeps_the_arts_swatch_highlighted() {fn images_and_unswatched_text_highlight_no_swatch() {let mut app = app();let mut png = vec![];- image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255]))- .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)- .unwrap();+ image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();let data = vectorcraft_format::base64_encode(&png);app.run("file.place", json!({"name": "a.png", "dataBase64": data, "link": false})).unwrap();assert_eq!(active_swatch(&app), None, "an image: no swatch");diff --git a/crates/ui-egui/src/panels/tabs/tests.rs b/crates/ui-egui/src/panels/tabs/tests.rsindex e193f0ab5..e7919b448 100644--- a/crates/ui-egui/src/panels/tabs/tests.rs+++ b/crates/ui-egui/src/panels/tabs/tests.rs@@ -406,8 +406,7 @@ fn an_x_typed_past_the_next_stop_keeps_the_stop_selected() {let type_x = |app: &mut VectorcraftApp, shown: &str, typed: &str| {let texts = panel_frame(&ctx, app, vec![]);let at = texts.iter().find(|(t, _)| t == shown).unwrap_or_else(|| panic!("{shown} in {texts:?}")).1.center();- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };panel_frame(&ctx, app, vec![egui::Event::PointerMoved(at), button(true)]);panel_frame(&ctx, app, vec![button(false)]);panel_frame(&ctx, app, vec![key(egui::Key::A, egui::Modifiers::COMMAND)]);diff --git a/crates/ui-egui/src/prefs_dialog/tests.rs b/crates/ui-egui/src/prefs_dialog/tests.rsindex dd8617977..c433fbc02 100644--- a/crates/ui-egui/src/prefs_dialog/tests.rs+++ b/crates/ui-egui/src/prefs_dialog/tests.rs@@ -319,8 +319,7 @@ fn numbers_without_units_are_points_reaches_the_fields_and_dims_without_picas()/// choices this version offers are kept (#502).#[test]fn a_graphics_processor_this_version_does_not_offer_reads_as_automatic() {- for (saved, read) in [("powerSaving", "automatic"), ("turbo", "automatic"), ("lowPower", "lowPower"), ("highPerformance", "highPerformance")]- {+ for (saved, read) in [("powerSaving", "automatic"), ("turbo", "automatic"), ("lowPower", "lowPower"), ("highPerformance", "highPerformance")] {let mut a = app();a.ui.engine_prefs = json!({"gpuPreference": saved});restore(&mut a);diff --git a/crates/ui-egui/src/shortcuts/tests.rs b/crates/ui-egui/src/shortcuts/tests.rsindex 8edeeafd1..f679b1638 100644--- a/crates/ui-egui/src/shortcuts/tests.rs+++ b/crates/ui-egui/src/shortcuts/tests.rs@@ -30,8 +30,7 @@ fn option_and_altgr_still_type_but_cmd_and_ctrl_chords_do_not() {/// the text it typed when `typed` is given.fn ctrl_alt_press(key: Key, typed: Option<&str>) -> Vec<egui::Event> {let m = Modifiers::CTRL | Modifiers::ALT | Modifiers::COMMAND;- let mut v =- vec![egui::Event::ModifiersChanged(m), egui::Event::Key { key, physical_key: Some(key), pressed: true, repeat: false, modifiers: m }];+ let mut v = vec![egui::Event::ModifiersChanged(m), egui::Event::Key { key, physical_key: Some(key), pressed: true, repeat: false, modifiers: m }];v.extend(typed.map(|t| egui::Event::Text(t.into())));v}@@ -213,8 +212,7 @@ fn cmd_shift_b_while_typing_is_bold_not_the_bounding_box() {}frame(&mut app, vec![egui::Event::Text("Bold".into())]);assert!(app.session.tool_wants_text());- let chord =- egui::Event::Key { key: Key::B, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::SHIFT };+ let chord = egui::Event::Key { key: Key::B, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::SHIFT };frame(&mut app, vec![chord.clone()]);assert!(app.ui.view.bounding_box, "the bounding box stays");// The chord reached Bold: the text is in a bold face, or its family has none and says so.@@ -234,20 +232,15 @@ fn cmd_shift_letters_align_paragraphs() {let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());app.session.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();let id = app.session.execute("text.create", &json!({"x": 20, "y": 50, "text": "One\nTwo"})).unwrap()["id"].as_u64().unwrap();- let chord =- |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::SHIFT };+ let chord = |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::SHIFT };let paras = |app: &VectorcraftApp| match &app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().kind {vectorcraft_doc::NodeKind::Text(t) => (0..t.paragraph_count()).map(|i| t.para_at(i).justify).collect::<Vec<_>>(),_ => panic!("text"),};app.session.execute("select.set", &json!({"ids": [id]})).unwrap();- for (key, want) in [- (Key::C, Justify::Center),- (Key::R, Justify::Right),- (Key::J, Justify::JustifyLeft),- (Key::F, Justify::JustifyAll),- (Key::L, Justify::Left),- ] {+ for (key, want) in+ [(Key::C, Justify::Center), (Key::R, Justify::Right), (Key::J, Justify::JustifyLeft), (Key::F, Justify::JustifyAll), (Key::L, Justify::Left)]+ {frame(&mut app, vec![chord(key)]);assert_eq!(paras(&app), [want, want], "{key:?}");}@@ -271,8 +264,7 @@ fn cmd_alt_q_resets_tracking_and_kerning() {let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());app.session.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();let id = app.session.execute("text.create", &json!({"x": 20, "y": 50, "text": "One Two"})).unwrap()["id"].as_u64().unwrap();- let spaced =- |app: &mut VectorcraftApp| app.session.execute("text.setRangeStyle", &json!({"id": id, "tracking": 200, "kerning": -40})).unwrap();+ let spaced = |app: &mut VectorcraftApp| app.session.execute("text.setRangeStyle", &json!({"id": id, "tracking": 200, "kerning": -40})).unwrap();let spacing = |app: &mut VectorcraftApp| {let r = app.session.execute("text.getRange", &json!({"id": id})).unwrap();r["runs"]@@ -282,8 +274,7 @@ fn cmd_alt_q_resets_tracking_and_kerning() {.map(|run| (run["text"].clone(), run["style"]["tracking"].clone(), run["style"]["kerning"].clone())).collect::<Vec<_>>()};- let chord =- egui::Event::Key { key: Key::Q, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::ALT };+ let chord = egui::Event::Key { key: Key::Q, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::ALT };spaced(&mut app);app.session.execute("select.set", &json!({"ids": [id]})).unwrap();frame(&mut app, vec![chord.clone()]);@@ -679,11 +670,7 @@ fn a_command_on_cmd_escape_runs_without_the_tools_escape() {if bindable {edit(&mut app);frame(&mut app, cmd_escape());- assert_eq!(- (app.session.tool_wants_text(), app.ui.view.grid),- (true, grid),- "Cmd+Escape runs Show Grid and the Type tool goes on editing"- );+ assert_eq!((app.session.tool_wants_text(), app.ui.view.grid), (true, grid), "Cmd+Escape runs Show Grid and the Type tool goes on editing");}app.select_tool("selection");app.session.execute("object.isolate", &json!({"id": id})).unwrap();@@ -865,8 +852,7 @@ fn shifted_punctuation_shortcuts_work_as_typed() {let a = app.session.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"].clone();let b = app.session.execute("shape.ellipse", &json!({"x": 20, "y": 20, "width": 50, "height": 50})).unwrap()["id"].clone();app.session.execute("select.set", &json!({"ids": [a]})).unwrap();- let order =- |app: &VectorcraftApp| -> Vec<u64> { app.session.doc().unwrap().doc.layers[0].children().unwrap().iter().map(|n| n.id.0).collect() };+ let order = |app: &VectorcraftApp| -> Vec<u64> { app.session.doc().unwrap().doc.layers[0].children().unwrap().iter().map(|n| n.id.0).collect() };let (a, b) = (a.as_u64().unwrap(), b.as_u64().unwrap());assert_eq!(order(&app), [a, b]);let press = |key, modifiers| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers };@@ -1026,8 +1012,7 @@ fn digit_keys_reach_a_dragging_tool_once_per_press() {app.session.execute("perspective.attach", &json!({"ids": [id], "plane": "right"})).unwrap();app.select_tool("perspectiveSelection");let v = app.view_info();- let c =- app.session.doc().unwrap().doc.node(vectorcraft_engine::doc::NodeId(id.as_u64().unwrap())).unwrap().geometric_bounds().unwrap().center();+ let c = app.session.doc().unwrap().doc.node(vectorcraft_engine::doc::NodeId(id.as_u64().unwrap())).unwrap().geometric_bounds().unwrap().center();app.session.pointer(&PointerEvent::new(PointerKind::Down, c.x, c.y), v).unwrap();app.session.pointer(&PointerEvent::new(PointerKind::Drag, c.x + 30.0, c.y), v).unwrap();let key = |repeat| egui::Event::Key { key: Key::Num5, physical_key: None, pressed: true, repeat, modifiers: Modifiers::NONE };@@ -1209,8 +1194,7 @@ fn a_new_context_takes_its_own_frame_zero() {let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());let press = |app: &mut VectorcraftApp| {let ctx = egui::Context::default();- let ev =- egui::Event::Key { key: Key::N, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::ALT };+ let ev = egui::Event::Key { key: Key::N, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND | Modifiers::ALT };let mut out = ctx.run_ui(egui::RawInput { events: vec![ev], ..Default::default() }, |ui| handle(app, ui.ctx()));out.textures_delta.clear();};diff --git a/crates/ui-egui/src/toolbar/tests.rs b/crates/ui-egui/src/toolbar/tests.rsindex 43e4addec..777baa40e 100644--- a/crates/ui-egui/src/toolbar/tests.rs+++ b/crates/ui-egui/src/toolbar/tests.rs@@ -281,8 +281,7 @@ fn double_clicking_the_line_arc_and_grid_tools_opens_their_tool_options() {("rectangularGrid", "rows", json!(2), "shape.rectangularGrid", "rows"),("polarGrid", "radial", json!(3), "shape.polarGrid", "radial"),];- let objects =- |app: &VectorcraftApp| app.session.active().unwrap().doc.layers.iter().map(|l| l.children().map_or(0, |c| c.len())).sum::<usize>();+ let objects = |app: &VectorcraftApp| app.session.active().unwrap().doc.layers.iter().map(|l| l.children().map_or(0, |c| c.len())).sum::<usize>();let drag = |app: &mut VectorcraftApp| {let view = app.view_info();for (kind, x, y) in [@@ -701,10 +700,7 @@ fn a_flyout_dragged_by_its_bar_floats_until_its_close_box_puts_it_back() {// A strip of its nine tools' buttons, its bar under the pointer.let drop = bar + vec2(60.0, 40.0);assert!(float.height() < 40.0 && float.width() > 9.0 * STRIP_BUTTON.x, "a one-row strip: {float:?}");- assert!(- (float.right() - 1.0 - BAR / 2.0 - drop.x).abs() < 1.0 && float.y_range().contains(drop.y),- "its bar is under the pointer: {float:?}"- );+ assert!((float.right() - 1.0 - BAR / 2.0 - drop.x).abs() < 1.0 && float.y_range().contains(drop.y), "its bar is under the pointer: {float:?}");// The same bar moves it.let bar = pos2(float.right() - 1.0 - BAR / 2.0, float.bottom() - 6.0);drag(&mut app, &ctx, 3.0, bar, &[bar + vec2(0.0, 20.0), bar + vec2(-10.0, 100.0)]);diff --git a/crates/ui-egui/src/widgets/look_tests.rs b/crates/ui-egui/src/widgets/look_tests.rsindex fd2ec6a81..d0032aa3f 100644--- a/crates/ui-egui/src/widgets/look_tests.rs+++ b/crates/ui-egui/src/widgets/look_tests.rs@@ -194,8 +194,7 @@ fn a_slider_focused_by_a_click_shows_its_outline_only_after_a_key() {};frame(&ctx, 0.0, vec![], &mut add);let at = rail.get().center();- let button =- |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };+ let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };frame(&ctx, 0.1, vec![egui::Event::PointerMoved(at), button(true)], &mut add);frame(&ctx, 0.2, vec![button(false)], &mut add);let shapes = frame(&ctx, 0.3, vec![], &mut add);