Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: pedantic cargo clippy, do not use Results for always-succeeding functions

Browse Source
This commit is contained in:
Aleksander
2025-08-16 21:27:47 +02:00
parent 1f8960033c
commit 481db7f23c
45 changed files with 320 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wgui/src/components/button.rs
View File

@@ -265,7 +265,7 @@ pub fn construct<U1, U2>(
round: params.round,
border_color: params.border_color,
border: 2.0,
})?,
}),
style,
)?;
@@ -287,10 +287,8 @@ pub fn construct<U1, U2>(
..params.text_style
},
},
)?,
taffy::Style {
..Default::default()
},
),
Default::default(),
)?;
let data = Rc::new(Data {

28
wgui/src/components/checkbox.rs
View File

@@ -150,7 +150,7 @@ fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
}
fn register_event_mouse_enter<U1, U2>(
data: Rc<Data>,
data: &Rc<Data>,
state: Rc<RefCell<State>>,
listeners: &mut EventListenerCollection<U1, U2>,
listener_handles: &mut ListenerHandleVec,
@@ -171,7 +171,7 @@ fn register_event_mouse_enter<U1, U2>(
}
fn register_event_mouse_leave<U1, U2>(
data: Rc<Data>,
data: &Rc<Data>,
state: Rc<RefCell<State>>,
listeners: &mut EventListenerCollection<U1, U2>,
listener_handles: &mut ListenerHandleVec,
@@ -192,7 +192,7 @@ fn register_event_mouse_leave<U1, U2>(
}
fn register_event_mouse_press<U1, U2>(
data: Rc<Data>,
data: &Rc<Data>,
state: Rc<RefCell<State>>,
listeners: &mut EventListenerCollection<U1, U2>,
listener_handles: &mut ListenerHandleVec,
@@ -289,7 +289,7 @@ pub fn construct<U1, U2>(
border_color: Color::new(1.0, 1.0, 1.0, 0.0),
round: WLength::Units(5.0),
..Default::default()
})?,
}),
style,
)?;
@@ -306,7 +306,7 @@ pub fn construct<U1, U2>(
round: WLength::Units(8.0),
color: Color::new(1.0, 1.0, 1.0, 0.0),
..Default::default()
})?,
}),
taffy::Style {
size: box_size,
padding: taffy::Rect::length(4.0),
@@ -326,7 +326,7 @@ pub fn construct<U1, U2>(
COLOR_UNCHECKED
},
..Default::default()
})?,
}),
taffy::Style {
size: taffy::Size {
width: percent(1.0),
@@ -347,17 +347,15 @@ pub fn construct<U1, U2>(
..Default::default()
},
},
)?,
taffy::Style {
..Default::default()
},
),
Default::default(),
)?;
let data = Rc::new(Data {
node_label,
id_container,
id_label,
id_inner_box,
id_label,
node_label,
});
let state = Rc::new(RefCell::new(State {
@@ -369,9 +367,9 @@ pub fn construct<U1, U2>(
let mut base = ComponentBase::default();
register_event_mouse_enter(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_leave(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_press(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_enter(&data, state.clone(), listeners, &mut base.lhandles);
register_event_mouse_leave(&data, state.clone(), listeners, &mut base.lhandles);
register_event_mouse_press(&data, state.clone(), listeners, &mut base.lhandles);
register_event_mouse_release(data.clone(), state.clone(), listeners, &mut base.lhandles);
let checkbox = Rc::new(ComponentCheckbox { base, data, state });

3
wgui/src/components/mod.rs
View File

@@ -32,6 +32,7 @@ pub struct Component(pub Rc<dyn ComponentTrait>);
pub type ComponentWeak = std::rc::Weak<dyn ComponentTrait>;
impl Component {
pub fn weak(&self) -> ComponentWeak {
Rc::downgrade(&self.0)
}
@@ -42,6 +43,6 @@ impl Component {
}
// safety: we already checked it above, should be safe to directly cast it
unsafe { Ok(Rc::from_raw(Rc::into_raw(self.0.clone()) as _)) }
unsafe { Ok(Rc::from_raw(Rc::into_raw(self.0.clone()).cast())) }
}
}

20
wgui/src/components/slider.rs
View File

@@ -131,7 +131,7 @@ impl State {
self.set_value(common.state, data, common.alterables, val);
}
fn update_text(&self, i18n: &mut I18n, text: &mut WidgetLabel, value: f32) {
fn update_text(i18n: &mut I18n, text: &mut WidgetLabel, value: f32) {
// round displayed value, should be sufficient for now
text.set_text(
i18n,
@@ -156,7 +156,7 @@ impl State {
state
.widgets
.call(data.slider_text_id, |label: &mut WidgetLabel| {
self.update_text(&mut state.globals.i18n(), label, value);
Self::update_text(&mut state.globals.i18n(), label, value);
});
}
}
@@ -286,7 +286,7 @@ fn register_event_mouse_press<U1, U2>(
if state.hovered {
state.dragging = true;
state.update_value_to_mouse(event_data, &data, common)
state.update_value_to_mouse(event_data, &data, common);
}
Ok(())
@@ -295,7 +295,7 @@ fn register_event_mouse_press<U1, U2>(
}
fn register_event_mouse_release<U1, U2>(
data: Rc<Data>,
data: &Rc<Data>,
state: Rc<RefCell<State>>,
listeners: &mut EventListenerCollection<U1, U2>,
listener_handles: &mut ListenerHandleVec,
@@ -328,7 +328,7 @@ pub fn construct<U1, U2>(
style.min_size = style.size;
style.max_size = style.size;
let (body_id, slider_body_node) = layout.add_child(parent, WidgetDiv::create()?, style)?;
let (body_id, slider_body_node) = layout.add_child(parent, WidgetDiv::create(), style)?;
let (_background_id, _) = layout.add_child(
body_id,
@@ -338,7 +338,7 @@ pub fn construct<U1, U2>(
border_color: BODY_BORDER_COLOR,
border: 2.0,
..Default::default()
})?,
}),
taffy::Style {
size: taffy::Size {
width: percent(1.0),
@@ -364,7 +364,7 @@ pub fn construct<U1, U2>(
// invisible outer handle body
let (slider_handle_id, slider_handle_node) =
layout.add_child(body_id, WidgetDiv::create()?, slider_handle_style)?;
layout.add_child(body_id, WidgetDiv::create(), slider_handle_style)?;
let (slider_handle_rect_id, _) = layout.add_child(
slider_handle_id,
@@ -374,7 +374,7 @@ pub fn construct<U1, U2>(
border: 2.0,
round: WLength::Percent(1.0),
..Default::default()
})?,
}),
taffy::Style {
position: taffy::Position::Absolute,
size: taffy::Size {
@@ -406,7 +406,7 @@ pub fn construct<U1, U2>(
..Default::default()
},
},
)?,
),
Default::default(),
)?;
@@ -427,7 +427,7 @@ pub fn construct<U1, U2>(
register_event_mouse_motion(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_press(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_leave(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_release(data.clone(), state.clone(), listeners, &mut base.lhandles);
register_event_mouse_release(&data, state.clone(), listeners, &mut base.lhandles);
let slider = Rc::new(ComponentSlider { base, data, state });