Skip to content

Commit 548fd8e

Browse files
g-planeg-plane
committed
apply Clippy suggestions
1 parent 7d9dae8 commit 548fd8e

File tree

5 files changed

+45
-59
lines changed

5 files changed

+45
-59
lines changed

‎plugin/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(clippy::not_unsafe_ptr_arg_deref)]
22

33
use swc_core::{
4-
ecma::{ast::Program, visit::{FoldWith, visit_mut_pass}},
4+
ecma::{ast::Program, visit::visit_mut_pass},
55
plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
66
};
77
use swc_vue_jsx_visitor::VueJsxTransformVisitor;

‎visitor/src/directive.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub(crate) fn parse_directive(jsx_attr: &JSXAttr, is_component: bool) -> Directi
8585
})) = &jsx_attr.value
8686
{
8787
if let Expr::Array(ArrayLit { elems, .. }) = &**expr {
88-
value = match elems.get(0) {
88+
value = match elems.first() {
8989
Some(Some(ExprOrSpread { spread: None, expr })) => (**expr).clone(),
9090
_ => Expr::Ident(quote_ident!("").into()),
9191
};
@@ -164,7 +164,7 @@ fn parse_v_text_directive(jsx_attr: &JSXAttr) -> Directive {
164164
..
165165
})) => {
166166
if let Some(Some(ExprOrSpread { spread: None, expr })) =
167-
expr.as_array().and_then(|array| array.elems.get(0))
167+
expr.as_array().and_then(|array| array.elems.first())
168168
{
169169
(**expr).clone()
170170
} else {
@@ -197,7 +197,7 @@ fn parse_v_html_directive(jsx_attr: &JSXAttr) -> Directive {
197197
..
198198
})) => {
199199
if let Some(Some(ExprOrSpread { spread: None, expr })) =
200-
expr.as_array().and_then(|array| array.elems.get(0))
200+
expr.as_array().and_then(|array| array.elems.first())
201201
{
202202
(**expr).clone()
203203
} else {
@@ -248,7 +248,7 @@ fn parse_v_model_directive(
248248
let value;
249249

250250
if let Expr::Array(ArrayLit { elems, .. }) = attr_value {
251-
value = match elems.get(0) {
251+
value = match elems.first() {
252252
Some(Some(ExprOrSpread { spread: None, expr })) => (**expr).clone(),
253253
_ => Expr::Ident(quote_ident!("").into()),
254254
};

‎visitor/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,13 +1294,9 @@ where
12941294
Expr::JSXElement(jsx_element) => *expr = self.transform_jsx_element(jsx_element),
12951295
Expr::JSXFragment(jsx_fragment) => *expr = self.transform_jsx_fragment(jsx_fragment),
12961296
Expr::Assign(AssignExpr {
1297-
left: AssignTarget::Simple(simple_assign_target),
1297+
left: AssignTarget::Simple(SimpleAssignTarget::Ident(binding_ident)),
12981298
..
1299-
}) => {
1300-
if let SimpleAssignTarget::Ident(binding_ident) = &*simple_assign_target {
1301-
self.assignment_left = Some(binding_ident.id.clone());
1302-
}
1303-
}
1299+
}) => self.assignment_left = Some(binding_ident.id.clone()),
13041300
_ => {}
13051301
}
13061302
}

‎visitor/src/options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl<'de> Deserialize<'de> for Regex {
6565
/// Serde visitor for parsing string as the [`Regex`] type.
6666
struct RegexVisitor;
6767

68-
impl<'de> Visitor<'de> for RegexVisitor {
68+
impl Visitor<'_> for RegexVisitor {
6969
type Value = Regex;
7070

7171
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

‎visitor/src/resolve_type.rs

Lines changed: 37 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ where
2929
{
3030
pub(crate) fn extract_props_type(&mut self, setup_fn: &ExprOrSpread) -> Option<Expr> {
3131
let mut defaults = None;
32-
let Some(first_param_type) = (if let ExprOrSpread { expr, spread: None } = setup_fn {
32+
let first_param_type = if let ExprOrSpread { expr, spread: None } = setup_fn {
3333
match &**expr {
3434
Expr::Arrow(arrow) => arrow.params.first().and_then(|param| {
3535
if let Pat::Assign(AssignPat { right, .. }) = param {
@@ -44,10 +44,8 @@ where
4444
extract_type_ann_from_pat(&param.pat)
4545
}),
4646
_ => None,
47-
}
47+
}?
4848
} else {
49-
None
50-
}) else {
5149
return None;
5250
};
5351

@@ -76,36 +74,32 @@ where
7674
}),
7775
)),
7876
Prop::KeyValue(KeyValueProp { key, value }) => {
79-
let Some(key) = try_unwrap_lit_prop_name(key) else {
80-
return None;
81-
};
82-
Some((
83-
key,
84-
if value.is_lit() {
85-
(**value).clone()
86-
} else {
87-
Expr::Arrow(ArrowExpr {
88-
params: vec![],
89-
body: Box::new(BlockStmtOrExpr::Expr(
90-
value.clone(),
91-
)),
92-
is_async: false,
93-
is_generator: false,
94-
span: DUMMY_SP,
95-
..Default::default()
96-
})
97-
},
98-
))
77+
try_unwrap_lit_prop_name(key).map(|key| {
78+
(
79+
key,
80+
if value.is_lit() {
81+
(**value).clone()
82+
} else {
83+
Expr::Arrow(ArrowExpr {
84+
params: vec![],
85+
body: Box::new(BlockStmtOrExpr::Expr(
86+
value.clone(),
87+
)),
88+
is_async: false,
89+
is_generator: false,
90+
span: DUMMY_SP,
91+
..Default::default()
92+
})
93+
},
94+
)
95+
})
9996
}
10097
Prop::Getter(GetterProp {
10198
key,
10299
body: Some(body),
103100
..
104-
}) => {
105-
let Some(key) = try_unwrap_lit_prop_name(key) else {
106-
return None;
107-
};
108-
Some((
101+
}) => try_unwrap_lit_prop_name(key).map(|key| {
102+
(
109103
key,
110104
Expr::Arrow(ArrowExpr {
111105
params: vec![],
@@ -117,19 +111,18 @@ where
117111
span: DUMMY_SP,
118112
..Default::default()
119113
}),
120-
))
121-
}
114+
)
115+
}),
122116
Prop::Method(MethodProp { key, function }) => {
123-
let Some(key) = try_unwrap_lit_prop_name(key) else {
124-
return None;
125-
};
126-
Some((
127-
key,
128-
Expr::Fn(FnExpr {
129-
ident: None,
130-
function: function.clone(),
131-
}),
132-
))
117+
try_unwrap_lit_prop_name(key).map(|key| {
118+
(
119+
key,
120+
Expr::Fn(FnExpr {
121+
ident: None,
122+
function: function.clone(),
123+
}),
124+
)
125+
})
133126
}
134127
_ => None,
135128
}
@@ -1107,10 +1100,10 @@ where
11071100
}
11081101

11091102
pub(crate) fn extract_emits_type(&self, setup_fn: &ExprOrSpread) -> Option<ArrayLit> {
1110-
let Some(TsTypeAnn {
1103+
let TsTypeAnn {
11111104
type_ann: second_param_type,
11121105
..
1113-
}) = (if let ExprOrSpread { expr, spread: None } = setup_fn {
1106+
} = if let ExprOrSpread { expr, spread: None } = setup_fn {
11141107
match &**expr {
11151108
Expr::Arrow(arrow) => match arrow.params.get(1) {
11161109
Some(Pat::Ident(ident)) => ident.type_ann.as_deref(),
@@ -1125,12 +1118,9 @@ where
11251118
_ => return None,
11261119
},
11271120
_ => return None,
1128-
}
1121+
}?
11291122
} else {
11301123
return None;
1131-
})
1132-
else {
1133-
return None;
11341124
};
11351125

11361126
match &**second_param_type {

0 commit comments

Comments
 (0)