Resolve most Clippy lint issues

This commit is contained in:
Keavon Chambers
2024-02-29 00:48:28 -08:00
parent 8e769e37f6
commit 70dce1c230
25 changed files with 84 additions and 107 deletions
@@ -259,7 +259,7 @@ impl Fsm for FreehandToolFsmState {
FreehandToolFsmState::Drawing
}
(FreehandToolFsmState::Drawing, FreehandToolMessage::PointerMove) => {
if let Some(layer) = tool_data.layer.clone() {
if let Some(layer) = tool_data.layer {
let transform = document.metadata().transform_to_viewport(layer);
let pos = transform.inverse().transform_point2(input.mouse.position);
@@ -195,22 +195,13 @@ impl ToolTransition for PenTool {
}
}
}
#[derive(Default)]
struct ModifierState {
snap_angle: bool,
lock_angle: bool,
break_handle: bool,
}
impl Default for ModifierState {
fn default() -> Self {
ModifierState {
snap_angle: false,
lock_angle: false,
break_handle: false,
}
}
}
#[derive(Clone, Debug, Default)]
struct PenToolData {
weight: f64,
@@ -625,9 +625,9 @@ impl Fsm for SelectToolFsmState {
origin: point.document_point,
direction: total_mouse_delta_document.normalize(),
};
tool_data.snap_manager.constrained_snap(&snap_data, &point, constraint, None)
tool_data.snap_manager.constrained_snap(&snap_data, point, constraint, None)
} else {
tool_data.snap_manager.free_snap(&snap_data, &point, None, false)
tool_data.snap_manager.free_snap(&snap_data, point, None, false)
};
if best_snap.other_snap_better(&snapped) {
offset = snapped.snapped_point_document - point.document_point + mouse_delta_document;
@@ -1009,7 +1009,7 @@ impl Fsm for SelectToolFsmState {
}
}
fn not_artboard<'a>(document: &'a DocumentMessageHandler) -> impl Fn(&LayerNodeIdentifier) -> bool + 'a {
fn not_artboard(document: &DocumentMessageHandler) -> impl Fn(&LayerNodeIdentifier) -> bool + '_ {
|&layer| !document.metadata.is_artboard(layer)
}
@@ -323,7 +323,7 @@ fn update_spline(tool_data: &SplineToolData, show_preview: bool, responses: &mut
let subpath = bezier_rs::Subpath::new_cubic_spline(points);
let Some(layer) = tool_data.layer.clone() else {
let Some(layer) = tool_data.layer else {
return;
};
@@ -232,7 +232,7 @@ impl TextToolData {
responses.add(FrontendMessage::DisplayEditableTextbox {
text: editing_text.text.clone(),
line_width: None,
font_size: editing_text.font_size as f64,
font_size: editing_text.font_size,
color: editing_text.color.unwrap_or(Color::BLACK),
url: font_cache.get_preview_url(&editing_text.font).cloned().unwrap_or_default(),
transform: editing_text.transform.to_cols_array(),
@@ -323,7 +323,7 @@ impl TextToolData {
fn get_bounds(&self, text: &str, font_cache: &FontCache) -> Option<[DVec2; 2]> {
let editing_text = self.editing_text.as_ref()?;
let buzz_face = font_cache.get(&editing_text.font).map(|data| load_face(data));
let subpaths = graphene_core::text::to_path(text, buzz_face, editing_text.font_size as f64, None);
let subpaths = graphene_core::text::to_path(text, buzz_face, editing_text.font_size, None);
let bounds = subpaths.iter().filter_map(|subpath| subpath.bounding_box());
let combined_bounds = bounds.reduce(|a, b| [a[0].min(b[0]), a[1].max(b[1])]).unwrap_or_default();
Some(combined_bounds)
@@ -378,7 +378,7 @@ impl Fsm for TextToolFsmState {
});
if let Some(editing_text) = tool_data.editing_text.as_ref() {
let buzz_face = font_cache.get(&editing_text.font).map(|data| load_face(data));
let far = graphene_core::text::bounding_box(&tool_data.new_text, buzz_face, editing_text.font_size as f64, None);
let far = graphene_core::text::bounding_box(&tool_data.new_text, buzz_face, editing_text.font_size, None);
if far.x != 0. && far.y != 0. {
let quad = Quad::from_box([DVec2::ZERO, far]);
let transformed_quad = document.metadata().transform_to_viewport(tool_data.layer) * quad;
@@ -394,7 +394,7 @@ impl Fsm for TextToolFsmState {
continue;
};
let buzz_face = font_cache.get(font).map(|data| load_face(data));
let far = graphene_core::text::bounding_box(text, buzz_face, font_size as f64, None);
let far = graphene_core::text::bounding_box(text, buzz_face, font_size, None);
let quad = Quad::from_box([DVec2::ZERO, far]);
let multiplied = document.metadata().transform_to_viewport(layer) * quad;
overlay_context.quad(multiplied);