Skip to content

Commit 5150277

Browse files
JarredAllenJarredAllen
committed
Used clippy to clean itself
1 parent 5e20475 commit 5150277

19 files changed

+67
-154
lines changed

‎clippy_lints/src/attrs.rs‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -481,15 +481,11 @@ fn is_relevant_trait(cx: &LateContext<'_>, item: &TraitItem<'_>) -> bool {
481481
}
482482

483483
fn is_relevant_block(cx: &LateContext<'_>, tables: &ty::TypeckTables<'_>, block: &Block<'_>) -> bool {
484-
if let Some(stmt) = block.stmts.first() {
485-
match &stmt.kind {
484+
block.stmts.first().map_or(block.expr.as_ref().map_or(false, |e| is_relevant_expr(cx, tables, e)), |stmt| match &stmt.kind {
486485
StmtKind::Local(_) => true,
487486
StmtKind::Expr(expr) | StmtKind::Semi(expr) => is_relevant_expr(cx, tables, expr),
488487
_ => false,
489-
}
490-
} else {
491-
block.expr.as_ref().map_or(false, |e| is_relevant_expr(cx, tables, e))
492-
}
488+
})
493489
}
494490

495491
fn is_relevant_expr(cx: &LateContext<'_>, tables: &ty::TypeckTables<'_>, expr: &Expr<'_>) -> bool {
@@ -499,11 +495,7 @@ fn is_relevant_expr(cx: &LateContext<'_>, tables: &ty::TypeckTables<'_>, expr: &
499495
ExprKind::Ret(None) | ExprKind::Break(_, None) => false,
500496
ExprKind::Call(path_expr, _) => {
501497
if let ExprKind::Path(qpath) = &path_expr.kind {
502-
if let Some(fun_id) = tables.qpath_res(qpath, path_expr.hir_id).opt_def_id() {
503-
!match_def_path(cx, fun_id, &paths::BEGIN_PANIC)
504-
} else {
505-
true
506-
}
498+
tables.qpath_res(qpath, path_expr.hir_id).opt_def_id().map_or(true, |fun_id| !match_def_path(cx, fun_id, &paths::BEGIN_PANIC))
507499
} else {
508500
true
509501
}

‎clippy_lints/src/if_let_mutex.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,9 @@ impl<'tcx> Visitor<'tcx> for ArmVisitor<'_, 'tcx> {
135135
}
136136
}
137137

138-
impl<'tcx> ArmVisitor<'_, 'tcx> {
138+
impl<'tcx, 'l> ArmVisitor<'tcx, 'l> {
139139
fn same_mutex(&self, cx: &LateContext<'_>, op_mutex: &Expr<'_>) -> bool {
140-
if let Some(arm_mutex) = self.found_mutex {
141-
SpanlessEq::new(cx).eq_expr(op_mutex, arm_mutex)
142-
} else {
143-
false
144-
}
140+
self.found_mutex.map_or(false, |arm_mutex| SpanlessEq::new(cx).eq_expr(op_mutex, arm_mutex))
145141
}
146142
}
147143

‎clippy_lints/src/len_zero.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,10 @@ fn has_is_empty(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
303303
let ty = &walk_ptrs_ty(cx.tables().expr_ty(expr));
304304
match ty.kind {
305305
ty::Dynamic(ref tt, ..) => {
306-
if let Some(principal) = tt.principal() {
307-
cx.tcx
306+
tt.principal().map_or(false, |principal| cx.tcx
308307
.associated_items(principal.def_id())
309308
.in_definition_order()
310-
.any(|item| is_is_empty(cx, &item))
311-
} else {
312-
false
313-
}
309+
.any(|item| is_is_empty(cx, &item)))
314310
},
315311
ty::Projection(ref proj) => has_is_empty_impl(cx, proj.item_def_id),
316312
ty::Adt(id, _) => has_is_empty_impl(cx, id.did),

‎clippy_lints/src/literal_representation.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,11 @@ impl LiteralDigitGrouping {
264264

265265
let (part, mistyped_suffixes, missing_char) = if let Some((_, exponent)) = &mut num_lit.exponent {
266266
(exponent, &["32", "64"][..], 'f')
267-
} else if let Some(fraction) = &mut num_lit.fraction {
268-
(fraction, &["32", "64"][..], 'f')
269267
} else {
270-
(&mut num_lit.integer, &["8", "16", "32", "64"][..], 'i')
268+
num_lit.fraction.as_mut().map_or(
269+
(&mut num_lit.integer, &["8", "16", "32", "64"][..], 'i'),
270+
|fraction| (fraction, &["32", "64"][..], 'f')
271+
)
271272
};
272273

273274
let mut split = part.rsplit('_');

‎clippy_lints/src/loops.rs‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,7 @@ fn never_loop_expr(expr: &Expr<'_>, main_loop_id: HirId) -> NeverLoopResult {
687687
}
688688
},
689689
ExprKind::Break(_, ref e) | ExprKind::Ret(ref e) => {
690-
if let Some(ref e) = *e {
691-
combine_seq(never_loop_expr(e, main_loop_id), NeverLoopResult::AlwaysBreak)
692-
} else {
693-
NeverLoopResult::AlwaysBreak
694-
}
690+
e.as_ref().map_or(NeverLoopResult::AlwaysBreak, |e| combine_seq(never_loop_expr(e, main_loop_id), NeverLoopResult::AlwaysBreak))
695691
},
696692
ExprKind::InlineAsm(ref asm) => asm
697693
.operands
@@ -1882,11 +1878,7 @@ fn is_iterable_array<'tcx>(ty: Ty<'tcx>, cx: &LateContext<'tcx>) -> bool {
18821878
// IntoIterator is currently only implemented for array sizes <= 32 in rustc
18831879
match ty.kind {
18841880
ty::Array(_, n) => {
1885-
if let Some(val) = n.try_eval_usize(cx.tcx, cx.param_env) {
1886-
(0..=32).contains(&val)
1887-
} else {
1888-
false
1889-
}
1881+
n.try_eval_usize(cx.tcx, cx.param_env).map_or(false, |val| (0..=32).contains(&val))
18901882
},
18911883
_ => false,
18921884
}
@@ -1899,11 +1891,7 @@ fn extract_expr_from_first_stmt<'tcx>(block: &Block<'tcx>) -> Option<&'tcx Expr<
18991891
return None;
19001892
}
19011893
if let StmtKind::Local(ref local) = block.stmts[0].kind {
1902-
if let Some(expr) = local.init {
1903-
Some(expr)
1904-
} else {
1905-
None
1906-
}
1894+
local.init.map(|expr| expr)
19071895
} else {
19081896
None
19091897
}
@@ -2023,15 +2011,11 @@ impl<'a, 'tcx> Visitor<'tcx> for InitializeVisitor<'a, 'tcx> {
20232011
if let PatKind::Binding(.., ident, _) = local.pat.kind {
20242012
self.name = Some(ident.name);
20252013

2026-
self.state = if let Some(ref init) = local.init {
2027-
if is_integer_const(&self.cx, init, 0) {
2014+
self.state = local.init.as_ref().map_or(VarState::Declared, |init| if is_integer_const(&self.cx, init, 0) {
20282015
VarState::Warn
20292016
} else {
20302017
VarState::Declared
2031-
}
2032-
} else {
2033-
VarState::Declared
2034-
}
2018+
})
20352019
}
20362020
}
20372021
}

‎clippy_lints/src/methods/mod.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2461,11 +2461,7 @@ fn derefs_to_slice<'tcx>(
24612461
ty::Adt(def, _) if def.is_box() => may_slice(cx, ty.boxed_ty()),
24622462
ty::Adt(..) => is_type_diagnostic_item(cx, ty, sym!(vec_type)),
24632463
ty::Array(_, size) => {
2464-
if let Some(size) = size.try_eval_usize(cx.tcx, cx.param_env) {
2465-
size < 32
2466-
} else {
2467-
false
2468-
}
2464+
size.try_eval_usize(cx.tcx, cx.param_env).map_or(false, |size| size < 32)
24692465
},
24702466
ty::Ref(_, inner, _) => may_slice(cx, inner),
24712467
_ => false,

‎clippy_lints/src/methods/unnecessary_filter_map.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ fn check_expression<'tcx>(cx: &LateContext<'tcx>, arg_id: hir::HirId, expr: &'tc
7878
(true, true)
7979
},
8080
hir::ExprKind::Block(ref block, _) => {
81-
if let Some(expr) = &block.expr {
82-
check_expression(cx, arg_id, &expr)
83-
} else {
84-
(false, false)
85-
}
81+
block.expr.as_ref().map_or((false, false), |expr| check_expression(cx, arg_id, &expr))
8682
},
8783
hir::ExprKind::Match(_, arms, _) => {
8884
let mut found_mapping = false;

‎clippy_lints/src/minmax.rs‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,19 @@ fn fetch_const<'a>(cx: &LateContext<'_>, args: &'a [Expr<'a>], m: MinMax) -> Opt
8686
if args.len() != 2 {
8787
return None;
8888
}
89-
if let Some(c) = constant_simple(cx, cx.tables(), &args[0]) {
90-
if constant_simple(cx, cx.tables(), &args[1]).is_none() {
91-
// otherwise ignore
92-
Some((m, c, &args[1]))
89+
constant_simple(cx, cx.tables, &args[0]).map_or_else(
90+
|| if let Some(c) = constant_simple(cx, cx.tables(), &args[1]) {
91+
Some((m, c, &args[0]))
9392
} else {
9493
None
94+
},
95+
|c| {
96+
if constant_simple(cx, cx.tables, &args[1]).is_none() {
97+
// otherwise ignore
98+
Some((c, &args[1]))
99+
} else {
100+
None
101+
}
95102
}
96-
} else if let Some(c) = constant_simple(cx, cx.tables(), &args[1]) {
97-
Some((m, c, &args[0]))
98-
} else {
99-
None
100-
}
103+
).map(|(c, arg)| (m, c, arg))
101104
}

‎clippy_lints/src/misc.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -682,16 +682,12 @@ fn check_to_owned(cx: &LateContext<'_>, expr: &Expr<'_>, other: &Expr<'_>, left:
682682
/// `unused_variables`'s idea
683683
/// of what it means for an expression to be "used".
684684
fn is_used(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
685-
if let Some(parent) = get_parent_expr(cx, expr) {
686-
match parent.kind {
685+
get_parent_expr(cx, expr).map_or(true, |parent| match parent.kind {
687686
ExprKind::Assign(_, ref rhs, _) | ExprKind::AssignOp(_, _, ref rhs) => {
688687
SpanlessEq::new(cx).eq_expr(rhs, expr)
689688
},
690689
_ => is_used(cx, parent),
691-
}
692-
} else {
693-
true
694-
}
690+
})
695691
}
696692

697693
/// Tests whether an expression is in a macro expansion (e.g., something

‎clippy_lints/src/option_if_let_else.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ declare_clippy_lint! {
3737
///
3838
/// ```rust
3939
/// # let optional: Option<u32> = Some(0);
40+
/// # fn do_complicated_function() -> u32 { 5 };
4041
/// let _ = if let Some(foo) = optional {
4142
/// foo
4243
/// } else {
@@ -54,9 +55,10 @@ declare_clippy_lint! {
5455
///
5556
/// ```rust
5657
/// # let optional: Option<u32> = Some(0);
58+
/// # fn do_complicated_function() -> u32 { 5 };
5759
/// let _ = optional.map_or(5, |foo| foo);
5860
/// let _ = optional.map_or_else(||{
59-
/// let y = do_complicated_function;
61+
/// let y = do_complicated_function();
6062
/// y*y
6163
/// }, |foo| foo);
6264
/// ```

0 commit comments

Comments
 (0)