mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-05 19:45:54 +00:00
rustfmt on the merged tree
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SdcgEu4Lr3moCCisdZShKz
This commit is contained in:
@@ -90,9 +90,9 @@ pub use document::*;
|
||||
pub use eval::{
|
||||
EdgeRef, FeatureResult, KeptSeparate, Model, ModelBody, ModelState, PlacedBodies, RevolveExtent, SavedModel, SolvedSketch, ThreadInfo,
|
||||
blend_target, curve_pick_error, draft_corner_options, edge_names_for, edge_refs, face_point_names, face_point_state, hole_direction_at,
|
||||
import_body_names, join_pieces_added, map_wire, metric_thread_sizes, object_height, parse_metric_thread, pattern_matrices, revolve_extent, revolve_extent_for_handle,
|
||||
revolve_extent_with_convention, select_profiles, sketch_hole_direction, sketch_line_plane, state_in_frame, state_in_frame_at, suggested_thread,
|
||||
suggested_thread_in, tangent_face_chain, through_all_distance, world_state, world_state_reusing,
|
||||
import_body_names, join_pieces_added, map_wire, metric_thread_sizes, object_height, parse_metric_thread, pattern_matrices, revolve_extent,
|
||||
revolve_extent_for_handle, revolve_extent_with_convention, select_profiles, sketch_hole_direction, sketch_line_plane, state_in_frame,
|
||||
state_in_frame_at, suggested_thread, suggested_thread_in, tangent_face_chain, through_all_distance, world_state, world_state_reusing,
|
||||
};
|
||||
pub use eval::{EvalCache, KeptResults};
|
||||
pub use expr::Expr;
|
||||
|
||||
@@ -184,7 +184,11 @@ enum Miss {
|
||||
impl FaceHit {
|
||||
/// What a feature says about how it found a face by its stored name `name` (`None`: exactly).
|
||||
pub fn note(&self, name: &str) -> Option<String> {
|
||||
if !self.verified && !self.on_point { Some(format!("face `{}` was found by geometry, not exact history; check it", quoted(name))) } else { None }
|
||||
if !self.verified && !self.on_point {
|
||||
Some(format!("face `{}` was found by geometry, not exact history; check it", quoted(name)))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -306,7 +310,11 @@ pub(crate) fn quoted(name: &str) -> String {
|
||||
impl EdgeHit {
|
||||
/// What a feature says about how it found an edge by its stored name `name` (`None`: exactly).
|
||||
pub fn note(&self, name: &str) -> Option<String> {
|
||||
if !self.verified && !self.on_point { Some(format!("edge `{}` was found by geometry, not exact history; check it", quoted(name))) } else { None }
|
||||
if !self.verified && !self.on_point {
|
||||
Some(format!("edge `{}` was found by geometry, not exact history; check it", quoted(name)))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -356,7 +356,16 @@ fn edit_joint_shows_components_for_point_and_frame_origins() {
|
||||
assert_eq!((&after.a, &after.b), (&before.a, &before.b), "{command}");
|
||||
|
||||
// Replacing just B with a face still edits only B, preserving A's point/frame.
|
||||
let body = app.session.world_state().unwrap().bodies.iter().find(|body| occurrence_of_body(&app.session, &body.name) == Some(b)).unwrap().name.clone();
|
||||
let body = app
|
||||
.session
|
||||
.world_state()
|
||||
.unwrap()
|
||||
.bodies
|
||||
.iter()
|
||||
.find(|body| occurrence_of_body(&app.session, &body.name) == Some(b))
|
||||
.unwrap()
|
||||
.name
|
||||
.clone();
|
||||
let picked = Sel::Face { body, index: 0, point: Vec3::new(40.0, 10.0, 10.0) };
|
||||
d.active = 1;
|
||||
d.pick(&app.session, picked);
|
||||
|
||||
Reference in New Issue
Block a user