Skip to content

Commit a7647c2

Browse files
committed
Rework the suspicious formatting lints.
2 parents 9e50049 + f0d6813 commit a7647c2

File tree

134 files changed

+5792
-1832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+5792
-1832
lines changed

clippy_lints/src/attrs/non_minimal_cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::{Attribute, NON_MINIMAL_CFG};
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::source::SpanRangeExt;
3+
use clippy_utils::source::SpanExt;
44
use rustc_ast::{MetaItemInner, MetaItemKind};
55
use rustc_errors::Applicability;
66
use rustc_lint::EarlyContext;

clippy_lints/src/attrs/unnecessary_clippy_cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::{Attribute, UNNECESSARY_CLIPPY_CFG};
22
use clippy_utils::diagnostics::{span_lint_and_note, span_lint_and_sugg};
3-
use clippy_utils::source::SpanRangeExt;
3+
use clippy_utils::source::SpanExt;
44
use itertools::Itertools;
55
use rustc_ast::AttrStyle;
66
use rustc_errors::Applicability;

clippy_lints/src/attrs/useless_attribute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::USELESS_ATTRIBUTE;
22
use super::utils::{is_lint_level, is_word, namespace_and_lint};
33
use clippy_utils::diagnostics::span_lint_and_then;
4-
use clippy_utils::source::{SpanRangeExt, first_line_of_span};
4+
use clippy_utils::source::{SpanExt, first_line_of_span};
55
use clippy_utils::sym;
66
use rustc_ast::{Attribute, Item, ItemKind};
77
use rustc_errors::Applicability;

clippy_lints/src/bool_to_int_with_if.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
2-
use clippy_utils::source::HasSession;
32
use clippy_utils::sugg::Sugg;
43
use clippy_utils::{higher, is_else_clause, is_in_const_context, span_contains_comment};
54
use rustc_ast::LitKind;
@@ -59,7 +58,7 @@ impl<'tcx> LateLintPass<'tcx> for BoolToIntWithIf {
5958
&& !is_in_const_context(cx)
6059
{
6160
let ty = cx.typeck_results().expr_ty(then);
62-
let mut applicability = if span_contains_comment(cx.sess().source_map(), expr.span) {
61+
let mut applicability = if span_contains_comment(cx, expr.span) {
6362
Applicability::MaybeIncorrect
6463
} else {
6564
Applicability::MachineApplicable

clippy_lints/src/booleans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_config::Conf;
22
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_hir_and_then};
33
use clippy_utils::msrvs::{self, Msrv};
4-
use clippy_utils::source::SpanRangeExt;
4+
use clippy_utils::source::SpanExt;
55
use clippy_utils::sugg::Sugg;
66
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
77
use clippy_utils::{eq_expr_value, sym};

clippy_lints/src/borrow_deref_ref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::reference::DEREF_ADDROF;
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::source::SpanRangeExt;
3+
use clippy_utils::source::SpanExt;
44
use clippy_utils::ty::implements_trait;
55
use clippy_utils::{get_parent_expr, is_expr_temporary_value, is_from_proc_macro, is_lint_allowed, is_mutable};
66
use rustc_errors::Applicability;

clippy_lints/src/casts/as_ptr_cast_mut.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::SpanRangeExt;
2+
use clippy_utils::source::SpanExt;
33
use rustc_errors::Applicability;
44
use rustc_hir::{Expr, ExprKind};
55
use rustc_lint::LateContext;

clippy_lints/src/casts/cast_lossless.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::is_in_const_context;
33
use clippy_utils::msrvs::{self, Msrv};
4-
use clippy_utils::source::SpanRangeExt;
4+
use clippy_utils::source::SpanExt;
55
use clippy_utils::sugg::Sugg;
66
use clippy_utils::ty::is_isize_or_usize;
77
use rustc_errors::Applicability;

clippy_lints/src/casts/manual_dangling_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::SpanRangeExt;
2+
use clippy_utils::source::SpanExt;
33
use clippy_utils::{expr_or_init, is_path_diagnostic_item, std_or_core, sym};
44
use rustc_ast::LitKind;
55
use rustc_errors::Applicability;

clippy_lints/src/casts/unnecessary_cast.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::numeric_literal::NumericLiteral;
3-
use clippy_utils::source::{SpanRangeExt, snippet_opt};
3+
use clippy_utils::source::{SpanExt, snippet_opt};
44
use clippy_utils::visitors::{Visitable, for_each_expr_without_closures};
55
use clippy_utils::{get_parent_expr, is_hir_ty_cfg_dependant, is_ty_alias, path_to_local};
66
use rustc_ast::{LitFloatType, LitIntType, LitKind};
@@ -167,7 +167,7 @@ pub(super) fn check<'tcx>(
167167
sym::assert_ne_macro,
168168
sym::debug_assert_ne_macro,
169169
];
170-
matches!(expr.span.ctxt().outer_expn_data().macro_def_id, Some(def_id) if
170+
matches!(expr.span.ctxt().outer_expn_data().macro_def_id, Some(def_id) if
171171
cx.tcx.get_diagnostic_name(def_id).is_some_and(|sym| ALLOWED_MACROS.contains(&sym)))
172172
}
173173

0 commit comments

Comments
 (0)