Skip to content

Commit a524be6

Browse files
committed
cargo dev fmt
1 parent 83874d0 commit a524be6

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

clippy_lints/src/booleans.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::utils::{
2-
get_trait_def_id, is_type_diagnostic_item, implements_trait, in_macro, paths, snippet_opt, span_lint_and_sugg,
2+
get_trait_def_id, implements_trait, in_macro, is_type_diagnostic_item, paths, snippet_opt, span_lint_and_sugg,
33
span_lint_and_then, SpanlessEq,
44
};
55
use if_chain::if_chain;
@@ -249,7 +249,9 @@ fn simplify_not(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> Option<String> {
249249
},
250250
ExprKind::MethodCall(path, _, args) if args.len() == 1 => {
251251
let type_of_receiver = cx.tables.expr_ty(&args[0]);
252-
if !is_type_diagnostic_item(cx, type_of_receiver, sym!(option_type)) && !is_type_diagnostic_item(cx, type_of_receiver, sym!(result_type)) {
252+
if !is_type_diagnostic_item(cx, type_of_receiver, sym!(option_type))
253+
&& !is_type_diagnostic_item(cx, type_of_receiver, sym!(result_type))
254+
{
253255
return None;
254256
}
255257
METHODS_WITH_NEGATION

clippy_lints/src/cognitive_complexity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_session::{declare_tool_lint, impl_lint_pass};
99
use rustc_span::source_map::Span;
1010
use rustc_span::BytePos;
1111

12-
use crate::utils::{snippet_opt, span_lint_and_help, LimitStack, is_type_diagnostic_item};
12+
use crate::utils::{is_type_diagnostic_item, snippet_opt, span_lint_and_help, LimitStack};
1313

1414
declare_clippy_lint! {
1515
/// **What it does:** Checks for methods with high cognitive complexity.

clippy_lints/src/fallible_impl_from.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use crate::utils::paths::{BEGIN_PANIC, BEGIN_PANIC_FMT, FROM_TRAIT};
2-
use crate::utils::{is_expn_of, match_def_path, method_chain_args, span_lint_and_then, walk_ptrs_ty, is_type_diagnostic_item};
2+
use crate::utils::{
3+
is_expn_of, is_type_diagnostic_item, match_def_path, method_chain_args, span_lint_and_then, walk_ptrs_ty,
4+
};
35
use if_chain::if_chain;
46
use rustc_hir as hir;
57
use rustc_lint::{LateContext, LateLintPass};
@@ -76,7 +78,9 @@ fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_it
7678
// check for `unwrap`
7779
if let Some(arglists) = method_chain_args(expr, &["unwrap"]) {
7880
let reciever_ty = walk_ptrs_ty(self.tables.expr_ty(&arglists[0][0]));
79-
if is_type_diagnostic_item(self.lcx, reciever_ty, sym!(option_type)) || is_type_diagnostic_item(self.lcx, reciever_ty, sym!(result_type)) {
81+
if is_type_diagnostic_item(self.lcx, reciever_ty, sym!(option_type))
82+
|| is_type_diagnostic_item(self.lcx, reciever_ty, sym!(result_type))
83+
{
8084
self.result.push(expr.span);
8185
}
8286
}

clippy_lints/src/matches.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use crate::utils::paths;
33
use crate::utils::sugg::Sugg;
44
use crate::utils::usage::is_unused;
55
use crate::utils::{
6-
expr_block, get_arg_name, get_parent_expr, in_macro, indent_of, is_allowed, is_expn_of, is_refutable, is_type_diagnostic_item, is_wild,
7-
match_qpath, match_type, match_var, multispan_sugg, remove_blocks, snippet, snippet_block,
8-
snippet_with_applicability, span_lint_and_help, span_lint_and_note, span_lint_and_sugg, span_lint_and_then,
9-
walk_ptrs_ty,
6+
expr_block, get_arg_name, get_parent_expr, in_macro, indent_of, is_allowed, is_expn_of, is_refutable,
7+
is_type_diagnostic_item, is_wild, match_qpath, match_type, match_var, multispan_sugg, remove_blocks, snippet,
8+
snippet_block, snippet_with_applicability, span_lint_and_help, span_lint_and_note, span_lint_and_sugg,
9+
span_lint_and_then, walk_ptrs_ty,
1010
};
1111
use if_chain::if_chain;
1212
use rustc_ast::ast::LitKind;

clippy_lints/src/methods/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -3209,9 +3209,7 @@ fn is_maybe_uninit_ty_valid(cx: &LateContext<'_, '_>, ty: Ty<'_>) -> bool {
32093209
match ty.kind {
32103210
ty::Array(ref component, _) => is_maybe_uninit_ty_valid(cx, component),
32113211
ty::Tuple(ref types) => types.types().all(|ty| is_maybe_uninit_ty_valid(cx, ty)),
3212-
ty::Adt(ref adt, _) => {
3213-
match_def_path(cx, adt.did, &paths::MEM_MAYBEUNINIT)
3214-
},
3212+
ty::Adt(ref adt, _) => match_def_path(cx, adt.did, &paths::MEM_MAYBEUNINIT),
32153213
_ => false,
32163214
}
32173215
}

clippy_lints/src/question_mark.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use rustc_session::{declare_lint_pass, declare_tool_lint};
77

88
use crate::utils::sugg::Sugg;
99
use crate::utils::{
10-
higher, is_type_diagnostic_item, match_def_path, match_qpath, paths, snippet_with_applicability, span_lint_and_sugg, SpanlessEq,
10+
higher, is_type_diagnostic_item, match_def_path, match_qpath, paths, snippet_with_applicability,
11+
span_lint_and_sugg, SpanlessEq,
1112
};
1213

1314
declare_clippy_lint! {

clippy_lints/src/unwrap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::utils::{higher::if_block, span_lint_and_then, usage::is_potentially_mutated, is_type_diagnostic_item};
1+
use crate::utils::{higher::if_block, is_type_diagnostic_item, span_lint_and_then, usage::is_potentially_mutated};
22
use if_chain::if_chain;
33
use rustc_hir::intravisit::{walk_expr, walk_fn, FnKind, NestedVisitorMap, Visitor};
44
use rustc_hir::{BinOpKind, Body, Expr, ExprKind, FnDecl, HirId, Path, QPath, UnOp};

0 commit comments

Comments
 (0)