mirror of
https://github.com/penpot/penpot.git
synced 2025-07-17 16:27:34 +02:00
🔧 Enable back clippy rules (#6492)
* 🔧 Fix lint script (rust) * 🔧 Temporarily add clippy rules to ignore so lint script passes * 💄 Fix clippy rule crate_in_macro_def * 💄 Fix clippy rule redundant-static-lifetimes * 💄 Fix clippy rule unnecessary_cast * 💄 Fix clippy rule nonminimal_bool * 💄 Fix clippy rule redundant_pattern_matching * 💄 Fix clippy rule assign_op_pattern * 💄 Fix clippy rule needless_lifetimes * 💄 Fix clippy rule for_kv_map * 💄 Fix clippy rule ptr_arg * 💄 Fix clippy rule match_like_matches_macro * 💄 Fix clippy rule macro_metavars_in_unsafe * 💄 Fix clippy rule map_clone * 💄 Fix clippy rule wrong_self_convention * 💄 Fix clippy rule vec_box * 💄 Fix clippy rule useless_format * 💄 Fix clippy rule unwrap_or_default * 💄 Fix clippy rule unused_unit * 💄 Fix clippy rule unnecessary_to_owned * 💄 Fix clippy rule too_many_arguments * 💄 Fix clippy rule slow_vector_initialization * 💄 Fix clippy rule single_match * 💄 Fix clippy rule redundant_field_names * 💄 Fix clippy rule rendudant_closure * 💄 Fix clippy rule needless_return * 💄 Fix clippy rule needless_range_loop * 💄 Fix clippy rule needless_borrows_for_generic_args * 💄 Fix clippy rule needless-borrow * 💄 Fix clippy rule missing_transmute_annotations * 💄 Fix clippy rule map_entry * 💄 Fix clippy rule manual_map * 💄 Fix clippy rule len_zero * 💄 Fix clippy rule from_over_into * 💄 Fix clippy rule field_reassign_with_default * 💄 Fix clippy rule enum_variant_names * 💄 Fix clippy rule derivable_impls * 💄 Fix clippy rule clone_on_copy * 💄 Fix clippy rule box_collection * 🔧 Make lint script also check test config target * 🔧 Remove cargo-watch as a lib dependency * 💄 Fix clippy rule for join_bounds * 🔧 Fix lint script return code --------- Co-authored-by: alonso.torres <alonso.torres@kaleidos.net>
This commit is contained in:
Belén Albeza
GitHub
parent
051c2a7e99
commit
8afd217a80
35 changed files with 447 additions and 2338 deletions
|
|
@ -141,7 +141,7 @@ impl ChildAxis {
|
|||
is_fill_main: child.is_layout_horizontal_fill(),
|
||||
is_fill_across: child.is_layout_vertical_fill(),
|
||||
z_index: layout_item.map(|i| i.z_index).unwrap_or(0),
|
||||
bounds: child_bounds.clone(),
|
||||
bounds: *child_bounds,
|
||||
}
|
||||
} else {
|
||||
Self {
|
||||
|
|
@ -159,7 +159,7 @@ impl ChildAxis {
|
|||
is_fill_main: child.is_layout_vertical_fill(),
|
||||
is_fill_across: child.is_layout_horizontal_fill(),
|
||||
z_index: layout_item.map(|i| i.z_index).unwrap_or(0),
|
||||
bounds: child_bounds.clone(),
|
||||
bounds: *child_bounds,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -267,7 +267,7 @@ fn initialize_tracks(
|
|||
}
|
||||
|
||||
// Resize main axis fill
|
||||
fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut Vec<TrackData>) {
|
||||
fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut [TrackData]) {
|
||||
for track in tracks.iter_mut() {
|
||||
let mut left_space = layout_axis.main_space() - track.main_size;
|
||||
let mut to_resize_children: Vec<&mut ChildAxis> = Vec::new();
|
||||
|
|
@ -284,9 +284,9 @@ fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut Vec<TrackDa
|
|||
let child = &mut to_resize_children[i];
|
||||
let delta =
|
||||
f32::min(child.max_main_size, child.main_size + current) - child.main_size;
|
||||
child.main_size = child.main_size + delta;
|
||||
left_space = left_space - delta;
|
||||
track.main_size = track.main_size + delta;
|
||||
child.main_size += delta;
|
||||
left_space -= delta;
|
||||
track.main_size += delta;
|
||||
|
||||
if (child.main_size - child.max_main_size).abs() < MIN_SIZE {
|
||||
to_resize_children.remove(i);
|
||||
|
|
@ -296,7 +296,7 @@ fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut Vec<TrackDa
|
|||
}
|
||||
}
|
||||
|
||||
fn distribute_fill_across_space(layout_axis: &LayoutAxis, tracks: &mut Vec<TrackData>) {
|
||||
fn distribute_fill_across_space(layout_axis: &LayoutAxis, tracks: &mut [TrackData]) {
|
||||
let total_across_size = tracks.iter().map(|t| t.across_size).sum::<f32>()
|
||||
+ (tracks.len() - 1) as f32 * layout_axis.gap_across;
|
||||
let mut left_space = layout_axis.across_space() - total_across_size;
|
||||
|
|
@ -314,8 +314,8 @@ fn distribute_fill_across_space(layout_axis: &LayoutAxis, tracks: &mut Vec<Track
|
|||
let track = &mut to_resize_tracks[i];
|
||||
let delta =
|
||||
f32::min(track.max_across_size, track.across_size + current) - track.across_size;
|
||||
track.across_size = track.across_size + delta;
|
||||
left_space = left_space - delta;
|
||||
track.across_size += delta;
|
||||
left_space -= delta;
|
||||
|
||||
if (track.across_size - track.max_across_size).abs() < MIN_SIZE {
|
||||
to_resize_tracks.remove(i);
|
||||
|
|
@ -342,7 +342,7 @@ fn distribute_fill_across_space(layout_axis: &LayoutAxis, tracks: &mut Vec<Track
|
|||
|
||||
fn stretch_tracks_sizes(
|
||||
layout_axis: &LayoutAxis,
|
||||
tracks: &mut Vec<TrackData>,
|
||||
tracks: &mut [TrackData],
|
||||
total_across_size: f32,
|
||||
) {
|
||||
let total_across_size = total_across_size + (tracks.len() - 1) as f32 * layout_axis.gap_across;
|
||||
|
|
@ -350,7 +350,7 @@ fn stretch_tracks_sizes(
|
|||
let delta = left_space / tracks.len() as f32;
|
||||
|
||||
for track in tracks.iter_mut() {
|
||||
track.across_size = track.across_size + delta;
|
||||
track.across_size += delta;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -358,7 +358,7 @@ fn calculate_track_positions(
|
|||
layout_data: &LayoutData,
|
||||
layout_axis: &LayoutAxis,
|
||||
layout_bounds: &Bounds,
|
||||
tracks: &mut Vec<TrackData>,
|
||||
tracks: &mut [TrackData],
|
||||
total_across_size: f32,
|
||||
) {
|
||||
let mut align_content = &layout_data.align_content;
|
||||
|
|
@ -411,7 +411,7 @@ fn calculate_track_positions(
|
|||
|
||||
for track in tracks.iter_mut() {
|
||||
track.anchor = next_anchor;
|
||||
next_anchor = next_anchor + layout_axis.across_v * real_gap;
|
||||
next_anchor += layout_axis.across_v * real_gap;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -450,7 +450,7 @@ fn calculate_track_data(
|
|||
}
|
||||
|
||||
calculate_track_positions(
|
||||
&layout_data,
|
||||
layout_data,
|
||||
&layout_axis,
|
||||
layout_bounds,
|
||||
&mut tracks,
|
||||
|
|
@ -556,7 +556,7 @@ pub fn reflow_flex_layout(
|
|||
structure: &HashMap<Uuid, Vec<StructureEntry>>,
|
||||
) -> VecDeque<Modifier> {
|
||||
let mut result = VecDeque::new();
|
||||
let layout_bounds = &bounds.find(&shape);
|
||||
let layout_bounds = &bounds.find(shape);
|
||||
let layout_axis = LayoutAxis::new(shape, layout_bounds, layout_data, flex_data);
|
||||
let tracks = calculate_track_data(
|
||||
shape,
|
||||
|
|
@ -570,7 +570,7 @@ pub fn reflow_flex_layout(
|
|||
|
||||
for track in tracks.iter() {
|
||||
let total_shapes_size = track.shapes.iter().map(|s| s.main_size).sum::<f32>();
|
||||
let mut shape_anchor = first_anchor(&layout_data, &layout_axis, track, total_shapes_size);
|
||||
let mut shape_anchor = first_anchor(layout_data, &layout_axis, track, total_shapes_size);
|
||||
|
||||
for child_axis in track.shapes.iter() {
|
||||
let child_id = child_axis.id;
|
||||
|
|
@ -602,7 +602,7 @@ pub fn reflow_flex_layout(
|
|||
{
|
||||
transform.post_concat(&math::resize_matrix(
|
||||
layout_bounds,
|
||||
&child_bounds,
|
||||
child_bounds,
|
||||
new_width,
|
||||
new_height,
|
||||
));
|
||||
|
|
@ -615,10 +615,10 @@ pub fn reflow_flex_layout(
|
|||
result.push_back(Modifier::transform(child.id, transform));
|
||||
|
||||
shape_anchor = next_anchor(
|
||||
&layout_data,
|
||||
layout_data,
|
||||
&layout_axis,
|
||||
&child_axis,
|
||||
&track,
|
||||
child_axis,
|
||||
track,
|
||||
shape_anchor,
|
||||
total_shapes_size,
|
||||
);
|
||||
|
|
@ -681,9 +681,7 @@ pub fn reflow_flex_layout(
|
|||
)
|
||||
};
|
||||
|
||||
let parent_transform = layout_bounds
|
||||
.transform_matrix()
|
||||
.unwrap_or(Matrix::default());
|
||||
let parent_transform = layout_bounds.transform_matrix().unwrap_or_default();
|
||||
|
||||
let parent_transform_inv = &parent_transform.invert().unwrap();
|
||||
let origin = parent_transform_inv.map_point(layout_bounds.nw);
|
||||
|
|
@ -692,7 +690,7 @@ pub fn reflow_flex_layout(
|
|||
scale.post_translate(origin);
|
||||
scale.post_concat(&parent_transform);
|
||||
scale.pre_translate(-origin);
|
||||
scale.pre_concat(&parent_transform_inv);
|
||||
scale.pre_concat(parent_transform_inv);
|
||||
|
||||
let layout_bounds_after = layout_bounds.transform(&scale);
|
||||
result.push_back(Modifier::parent(shape.id, scale));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue