Skip to content

Commit 7929c78

Browse files
author
Karol
committed
clippy
1 parent 9696760 commit 7929c78

24 files changed

Lines changed: 419 additions & 438 deletions

‎src/animate.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ impl PropCache {
222222
}
223223

224224
fn remove_prop(&mut self, prop: StylePropRef, idx: u16) {
225-
if let imbl::hashmap::Entry::Occupied(mut oe) = self.prop_map.entry(prop) {
226-
if let Ok(pos) = oe.get().binary_search(&PropFrameKind::Normal(idx)) {
227-
oe.get_mut().remove(pos);
228-
}
225+
if let imbl::hashmap::Entry::Occupied(mut oe) = self.prop_map.entry(prop)
226+
&& let Ok(pos) = oe.get().binary_search(&PropFrameKind::Normal(idx))
227+
{
228+
oe.get_mut().remove(pos);
229229
}
230230
}
231231

@@ -510,11 +510,11 @@ impl Animation {
510510
) -> Self {
511511
let frame = key_frame(KeyFrame::new(frame_id));
512512
let frame_style = frame.style.clone();
513-
if let Some(f) = self.key_frames.insert(frame_id, frame) {
514-
if let KeyFrameStyle::Style(style) = f.style {
515-
for prop in style.style_props() {
516-
self.cache.remove_prop(prop, frame_id);
517-
}
513+
if let Some(f) = self.key_frames.insert(frame_id, frame)
514+
&& let KeyFrameStyle::Style(style) = f.style
515+
{
516+
for prop in style.style_props() {
517+
self.cache.remove_prop(prop, frame_id);
518518
}
519519
}
520520
if let KeyFrameStyle::Style(style) = frame_style {

‎src/app_handle.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ impl ApplicationHandle {
218218
.reduce(window_handle.scale, &event)
219219
{
220220
Some(WindowEventTranslation::Keyboard(ke)) => {
221-
if let WindowEvent::KeyboardInput { is_synthetic, .. } = event {
222-
if !is_synthetic {
223-
window_handle.key_event(ke)
224-
}
221+
if let WindowEvent::KeyboardInput { is_synthetic, .. } = event
222+
&& !is_synthetic
223+
{
224+
window_handle.key_event(ke)
225225
}
226226
}
227227
Some(WindowEventTranslation::Pointer(pe)) => {

‎src/context.rs‎

Lines changed: 149 additions & 159 deletions
Large diffs are not rendered by default.

‎src/id.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ impl ViewId {
4545
// Remove the cached root, in the (unlikely) case that this view is
4646
// re-added to a different window
4747
s.root.remove(*self);
48-
if let Some(Some(parent)) = s.parent.get(*self) {
49-
if let Some(children) = s.children.get_mut(*parent) {
50-
children.retain(|c| c != self);
51-
}
48+
if let Some(Some(parent)) = s.parent.get(*self)
49+
&& let Some(children) = s.children.get_mut(*parent)
50+
{
51+
children.retain(|c| c != self);
5252
}
5353
s.view_ids.remove(*self);
5454
});
@@ -207,11 +207,11 @@ impl ViewId {
207207
// root_view_id() always returns SOMETHING. If the view is not yet added
208208
// to a window, it can be itself or its nearest ancestor, which means we
209209
// will store garbage permanently.
210-
if let Some(root) = root_view_id {
211-
if is_known_root(&root) {
212-
s.root.insert(*self, root_view_id);
213-
return Some(root);
214-
}
210+
if let Some(root) = root_view_id
211+
&& is_known_root(&root)
212+
{
213+
s.root.insert(*self, root_view_id);
214+
return Some(root);
215215
}
216216
None
217217
})

‎src/inspector/view.rs‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ pub fn capture(window_id: WindowId) {
7676
stack
7777
.style(|s| s.width_full().height_full())
7878
.on_event(EventListener::KeyUp, move |e| {
79-
if let Event::Key(e) = e {
80-
if e.key == keyboard::Key::Named(NamedKey::F11) && e.modifiers.shift() {
81-
id.inspect();
82-
return EventPropagation::Stop;
83-
}
79+
if let Event::Key(e) = e
80+
&& e.key == keyboard::Key::Named(NamedKey::F11)
81+
&& e.modifiers.shift()
82+
{
83+
id.inspect();
84+
return EventPropagation::Stop;
8485
}
8586
EventPropagation::Continue
8687
})
@@ -559,14 +560,14 @@ fn tree_node(
559560
let scroll_to = capture_signal.scroll_to;
560561
let expanding_selection = capture_signal.expanding_selection;
561562
create_effect(move |_| {
562-
if let Some((selection, request_focus)) = expanding_selection.get() {
563-
if selection == id {
564-
// Scroll to the row, then to the name part of the row.
565-
scroll_to.set(Some(row_id));
566-
scroll_to.set(Some(name_id));
567-
if request_focus {
568-
row_id.request_focus();
569-
}
563+
if let Some((selection, request_focus)) = expanding_selection.get()
564+
&& selection == id
565+
{
566+
// Scroll to the row, then to the name part of the row.
567+
scroll_to.set(Some(row_id));
568+
scroll_to.set(Some(name_id));
569+
if request_focus {
570+
row_id.request_focus();
570571
}
571572
}
572573
});

‎src/style.rs‎

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,16 +1546,16 @@ impl<T: StylePropValue> TransitionState<T> {
15461546
if let Some(transition) = &self.transition {
15471547
let time = now.saturating_duration_since(active.start);
15481548
let time_percent = time.as_secs_f64() / transition.duration.as_secs_f64();
1549-
if time < transition.duration || !transition.easing.finished(time_percent) {
1550-
if let Some(i) = T::interpolate(
1549+
if (time < transition.duration || !transition.easing.finished(time_percent))
1550+
&& let Some(i) = T::interpolate(
15511551
&active.before,
15521552
&active.after,
15531553
transition.easing.eval(time_percent),
1554-
) {
1555-
active.current = i;
1556-
*request_transition = true;
1557-
return true;
1558-
}
1554+
)
1555+
{
1556+
active.current = i;
1557+
*request_transition = true;
1558+
return true;
15591559
}
15601560
}
15611561
// time has past duration, or the value is not interpolatable
@@ -2073,13 +2073,13 @@ fn resolve_nested_maps_internal(
20732073
}
20742074

20752075
// DarkMode
2076-
if interact_state.is_dark_mode {
2077-
if let Some(map) = style.get_nested_map(StyleSelector::DarkMode.to_key()) {
2078-
classes_applied |= map.any_inherited();
2079-
style.apply_mut(map);
2080-
style.remove_nested_map(StyleSelector::DarkMode.to_key());
2081-
changed = true;
2082-
}
2076+
if interact_state.is_dark_mode
2077+
&& let Some(map) = style.get_nested_map(StyleSelector::DarkMode.to_key())
2078+
{
2079+
classes_applied |= map.any_inherited();
2080+
style.apply_mut(map);
2081+
style.remove_nested_map(StyleSelector::DarkMode.to_key());
2082+
changed = true;
20832083
}
20842084

20852085
// Disabled state (takes precedence)
@@ -2094,33 +2094,33 @@ fn resolve_nested_maps_internal(
20942094
// Other states only apply if not disabled
20952095

20962096
// Selected
2097-
if interact_state.is_selected || style.get(Selected) {
2098-
if let Some(map) = style.get_nested_map(StyleSelector::Selected.to_key()) {
2099-
classes_applied |= map.any_inherited();
2100-
style.apply_mut(map);
2101-
style.remove_nested_map(StyleSelector::Selected.to_key());
2102-
changed = true;
2103-
}
2097+
if (interact_state.is_selected || style.get(Selected))
2098+
&& let Some(map) = style.get_nested_map(StyleSelector::Selected.to_key())
2099+
{
2100+
classes_applied |= map.any_inherited();
2101+
style.apply_mut(map);
2102+
style.remove_nested_map(StyleSelector::Selected.to_key());
2103+
changed = true;
21042104
}
21052105

21062106
// Hover
2107-
if interact_state.is_hovered {
2108-
if let Some(map) = style.get_nested_map(StyleSelector::Hover.to_key()) {
2109-
classes_applied |= map.any_inherited();
2110-
style.apply_mut(map);
2111-
style.remove_nested_map(StyleSelector::Hover.to_key());
2112-
changed = true;
2113-
}
2107+
if interact_state.is_hovered
2108+
&& let Some(map) = style.get_nested_map(StyleSelector::Hover.to_key())
2109+
{
2110+
classes_applied |= map.any_inherited();
2111+
style.apply_mut(map);
2112+
style.remove_nested_map(StyleSelector::Hover.to_key());
2113+
changed = true;
21142114
}
21152115

21162116
// File Hover
2117-
if interact_state.is_file_hover {
2118-
if let Some(map) = style.get_nested_map(StyleSelector::FileHover.to_key()) {
2119-
classes_applied |= map.any_inherited();
2120-
style.apply_mut(map);
2121-
style.remove_nested_map(StyleSelector::FileHover.to_key());
2122-
changed = true;
2123-
}
2117+
if interact_state.is_file_hover
2118+
&& let Some(map) = style.get_nested_map(StyleSelector::FileHover.to_key())
2119+
{
2120+
classes_applied |= map.any_inherited();
2121+
style.apply_mut(map);
2122+
style.remove_nested_map(StyleSelector::FileHover.to_key());
2123+
changed = true;
21242124
}
21252125

21262126
// Focus states
@@ -2140,25 +2140,26 @@ fn resolve_nested_maps_internal(
21402140
changed = true;
21412141
}
21422142

2143-
if interact_state.is_clicking {
2144-
if let Some(map) = style.get_nested_map(StyleSelector::Active.to_key()) {
2145-
classes_applied |= map.any_inherited();
2146-
style.apply_mut(map);
2147-
style.remove_nested_map(StyleSelector::Active.to_key());
2148-
changed = true;
2149-
}
2143+
if interact_state.is_clicking
2144+
&& let Some(map) = style.get_nested_map(StyleSelector::Active.to_key())
2145+
{
2146+
classes_applied |= map.any_inherited();
2147+
style.apply_mut(map);
2148+
style.remove_nested_map(StyleSelector::Active.to_key());
2149+
changed = true;
21502150
}
21512151
}
21522152
}
21532153

21542154
// Active (mouse)
2155-
if interact_state.is_clicking && !interact_state.using_keyboard_navigation {
2156-
if let Some(map) = style.get_nested_map(StyleSelector::Active.to_key()) {
2157-
classes_applied |= map.any_inherited();
2158-
style.apply_mut(map);
2159-
style.remove_nested_map(StyleSelector::Active.to_key());
2160-
changed = true;
2161-
}
2155+
if interact_state.is_clicking
2156+
&& !interact_state.using_keyboard_navigation
2157+
&& let Some(map) = style.get_nested_map(StyleSelector::Active.to_key())
2158+
{
2159+
classes_applied |= map.any_inherited();
2160+
style.apply_mut(map);
2161+
style.remove_nested_map(StyleSelector::Active.to_key());
2162+
changed = true;
21622163
}
21632164
}
21642165

@@ -2272,11 +2273,11 @@ impl Style {
22722273
self.apply_context_mappings_mut();
22732274
}
22742275
}
2275-
if self.get(Selected) {
2276-
if let Some(map) = self.get_nested_map(StyleSelector::Selected.to_key()) {
2277-
self.apply_mut(map.apply_selectors(&[StyleSelector::Selected]));
2278-
self.apply_context_mappings_mut();
2279-
}
2276+
if self.get(Selected)
2277+
&& let Some(map) = self.get_nested_map(StyleSelector::Selected.to_key())
2278+
{
2279+
self.apply_mut(map.apply_selectors(&[StyleSelector::Selected]));
2280+
self.apply_context_mappings_mut();
22802281
}
22812282
self
22822283
}

‎src/views/decorator.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,11 @@ pub trait Decorators: IntoView<V = Self::DV> + Sized {
241241
modifiers,
242242
..
243243
}) = e
244+
&& *event_key == key
245+
&& cmp(*modifiers)
244246
{
245-
if *event_key == key && cmp(*modifiers) {
246-
action(e);
247-
return EventPropagation::Stop;
248-
}
247+
action(e);
248+
return EventPropagation::Stop;
249249
}
250250
EventPropagation::Continue
251251
})
@@ -267,11 +267,11 @@ pub trait Decorators: IntoView<V = Self::DV> + Sized {
267267
modifiers,
268268
..
269269
}) = e
270+
&& *event_key == key
271+
&& cmp(*modifiers)
270272
{
271-
if *event_key == key && cmp(*modifiers) {
272-
action(e);
273-
return EventPropagation::Stop;
274-
}
273+
action(e);
274+
return EventPropagation::Stop;
275275
}
276276
EventPropagation::Continue
277277
})

‎src/views/drag_window_area.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ pub fn drag_window_area<V: IntoView + 'static>(child: V) -> DragWindowArea {
2222
id.set_children([child]);
2323
DragWindowArea { id }
2424
.on_event_stop(EventListener::PointerDown, |e| {
25-
if let Event::Pointer(PointerEvent::Down(PointerButtonEvent { button, .. })) = e {
26-
if button.is_some_and(|b| b == PointerButton::Primary) {
27-
drag_window();
28-
}
25+
if let Event::Pointer(PointerEvent::Down(PointerButtonEvent { button, .. })) = e
26+
&& button.is_some_and(|b| b == PointerButton::Primary)
27+
{
28+
drag_window();
2929
}
3030
})
3131
.on_double_click_stop(|_| toggle_window_maximized())

‎src/views/dyn_stack.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ pub(crate) fn diff<K: Eq + Hash, V>(from: &FxIndexSet<K>, to: &FxIndexSet<K>) ->
227227
let mut removed_idx = removed.next().map(|k| from.get_full(k).unwrap().0);
228228

229229
for (idx, k) in to.iter().enumerate() {
230-
if let Some(added_idx) = added_idx.as_mut().filter(|r_i| **r_i == idx) {
231-
if let Some(next_added) = added.next().map(|k| to.get_full(k).unwrap().0) {
232-
*added_idx = next_added;
230+
if let Some(added_idx) = added_idx.as_mut().filter(|r_i| **r_i == idx)
231+
&& let Some(next_added) = added.next().map(|k| to.get_full(k).unwrap().0)
232+
{
233+
*added_idx = next_added;
233234

234-
normalized_idx = usize::wrapping_sub(normalized_idx, 1);
235-
}
235+
normalized_idx = usize::wrapping_sub(normalized_idx, 1);
236236
}
237237

238238
if let Some(removed_idx) = removed_idx.as_mut().filter(|r_i| **r_i == idx) {
@@ -243,13 +243,13 @@ pub(crate) fn diff<K: Eq + Hash, V>(from: &FxIndexSet<K>, to: &FxIndexSet<K>) ->
243243
}
244244
}
245245

246-
if let Some((from_idx, _)) = from.get_full(k) {
247-
if from_idx != normalized_idx || from_idx != idx {
248-
move_cmds.push(DiffOpMove {
249-
from: from_idx,
250-
to: idx,
251-
});
252-
}
246+
if let Some((from_idx, _)) = from.get_full(k)
247+
&& (from_idx != normalized_idx || from_idx != idx)
248+
{
249+
move_cmds.push(DiffOpMove {
250+
from: from_idx,
251+
to: idx,
252+
});
253253
}
254254

255255
normalized_idx = normalized_idx.wrapping_add(1);

‎src/views/editor/actions.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ fn handle_edit_command_default(
5858
// be more flexible.
5959
let had_edits = action.do_edit(ed, &mut cursor, cmd, modal, &mut register, smart_tab);
6060

61-
if had_edits {
62-
if let Some(data) = yank_data {
63-
register.add_delete(data);
64-
}
61+
if had_edits && let Some(data) = yank_data {
62+
register.add_delete(data);
6563
}
6664

6765
ed.cursor.set(cursor);

0 commit comments

Comments
 (0)