Skip to content

Commit 5fe59d0

Browse files
committed
pref: cargo clippy
1 parent 67b75bf commit 5fe59d0

File tree

7 files changed

+15
-31
lines changed

7 files changed

+15
-31
lines changed

thaw/src/alert/mod.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,10 @@ pub fn Alert(
7575
css_vars
7676
}
7777
});
78-
let icon = create_memo(move |_| {
79-
match variant.get() {
80-
AlertVariant::Success => icondata::AiCheckCircleFilled,
81-
AlertVariant::Warning => icondata::AiExclamationCircleFilled,
82-
AlertVariant::Error => icondata::AiCloseCircleFilled,
83-
}
84-
.into()
78+
let icon = create_memo(move |_| match variant.get() {
79+
AlertVariant::Success => icondata::AiCheckCircleFilled,
80+
AlertVariant::Warning => icondata::AiExclamationCircleFilled,
81+
AlertVariant::Error => icondata::AiCloseCircleFilled,
8582
});
8683

8784
view! {

thaw/src/checkbox/checkbox_item.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ pub fn CheckboxItem(
2323
if !checked.get_untracked() {
2424
checked.set(true);
2525
}
26-
} else {
27-
if checked.get_untracked() {
28-
checked.set(false);
29-
}
26+
} else if checked.get_untracked() {
27+
checked.set(false);
3028
}
3129
});
3230

thaw/src/collapse/collapse_item.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@ pub fn CollapseItem(
1818
let content_ref = create_node_ref::<html::Div>();
1919

2020
let is_show_content = create_memo(move |_| {
21-
collapse.value.with(|keys| {
22-
if key.with(|key| keys.contains(key)) {
23-
true
24-
} else {
25-
false
26-
}
27-
})
21+
collapse
22+
.value
23+
.with(|keys| key.with(|key| keys.contains(key)))
2824
});
2925

3026
let on_click = move |_| {

thaw/src/input/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pub fn Input(
144144

145145
#[cfg(debug_assertions)]
146146
{
147-
const INNER_ATTRS: [&'static str; 4] = ["type", "class", "disabled", "placeholder"];
147+
const INNER_ATTRS: [&str; 4] = ["type", "class", "disabled", "placeholder"];
148148
attrs.iter().for_each(|attr| {
149149
if INNER_ATTRS.contains(&attr.0) {
150150
logging::warn!(

thaw/src/input/text_area.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn TextArea(
9292

9393
#[cfg(debug_assertions)]
9494
{
95-
const INNER_ATTRS: [&'static str; 3] = ["class", "disabled", "placeholder"];
95+
const INNER_ATTRS: [&str; 3] = ["class", "disabled", "placeholder"];
9696
attrs.iter().for_each(|attr| {
9797
if INNER_ATTRS.contains(&attr.0) {
9898
logging::warn!(

thaw/src/utils/model.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ impl<T: Default> Default for Model<T> {
2020

2121
impl<T> Clone for Model<T> {
2222
fn clone(&self) -> Self {
23-
Self {
24-
read: self.read.clone(),
25-
write: self.write.clone(),
26-
on_write: self.on_write.clone(),
27-
}
23+
*self
2824
}
2925
}
3026

@@ -37,7 +33,7 @@ impl<T> Model<T> {
3733
}
3834

3935
pub fn signal(&self) -> Signal<T> {
40-
self.read.clone()
36+
self.read
4137
}
4238
}
4339

@@ -159,7 +155,7 @@ impl<T> From<(Memo<T>, WriteSignal<T>)> for Model<T> {
159155
impl<T: Default> From<(Option<T>, WriteSignal<T>)> for Model<T> {
160156
fn from((read, write): (Option<T>, WriteSignal<T>)) -> Self {
161157
let mut model = Self::new(read.unwrap_or_default());
162-
model.on_write = Some(write.into());
158+
model.on_write = Some(write);
163159
model
164160
}
165161
}

thaw/src/utils/optional_prop.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ impl<T> OptionalProp<T> {
2020
where
2121
F: FnOnce(T) -> U,
2222
{
23-
match self.0 {
24-
Some(x) => Some(f(x)),
25-
None => None,
26-
}
23+
self.0.map(f)
2724
}
2825

2926
pub fn into_option(self) -> Option<T> {

0 commit comments

Comments
 (0)