Skip to content

Commit 8ea7ec2

Browse files
suyashb95suyashb95
committed
fix formatting errors
1 parent f699494 commit 8ea7ec2

9 files changed

+35
-28
lines changed

‎clippy_lints/src/checked_conversions.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_hir::{BinOp, BinOpKind, Expr, ExprKind, QPath, TyKind};
77
use rustc_lint::{LateContext, LateLintPass, LintContext};
88
use rustc_middle::lint::in_external_macro;
99
use rustc_semver::RustcVersion;
10-
use rustc_session::{impl_lint_pass, declare_tool_lint};
10+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1111

1212
use crate::utils::{meets_msrv, snippet_with_applicability, span_lint_and_sugg, SpanlessEq};
1313

@@ -57,7 +57,6 @@ impl_lint_pass!(CheckedConversions => [CHECKED_CONVERSIONS]);
5757

5858
impl<'tcx> LateLintPass<'tcx> for CheckedConversions {
5959
fn check_expr(&mut self, cx: &LateContext<'_>, item: &Expr<'_>) {
60-
6160
if !meets_msrv(self.msrv.as_ref(), &CHECKED_CONVERSIONS_MSRV) {
6261
return;
6362
}

‎clippy_lints/src/mem_replace.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use crate::utils::{
2-
in_macro, match_def_path, match_qpath, paths, snippet, snippet_with_applicability, span_lint_and_help,
3-
span_lint_and_sugg, span_lint_and_then, meets_msrv
2+
in_macro, match_def_path, match_qpath, meets_msrv, paths, snippet, snippet_with_applicability, span_lint_and_help,
3+
span_lint_and_sugg, span_lint_and_then,
44
};
55
use if_chain::if_chain;
66
use rustc_errors::Applicability;
77
use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, QPath};
8-
use rustc_lint::{LintContext, LateContext, LateLintPass};
8+
use rustc_lint::{LateContext, LateLintPass, LintContext};
99
use rustc_middle::lint::in_external_macro;
1010
use rustc_semver::RustcVersion;
11-
use rustc_session::{impl_lint_pass, declare_tool_lint};
11+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1212
use rustc_span::source_map::Span;
1313
use rustc_span::symbol::sym;
1414

@@ -252,7 +252,7 @@ impl<'tcx> LateLintPass<'tcx> for MemReplace {
252252
check_replace_with_uninit(cx, src, dest, expr.span);
253253
if meets_msrv(self.msrv.as_ref(), &MEM_REPLACE_WITH_DEFAULT_MSRV) {
254254
check_replace_with_default(cx, src, dest, expr.span);
255-
}
255+
}
256256
}
257257
}
258258
}

‎clippy_lints/src/methods/mod.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -2742,11 +2742,11 @@ fn lint_map_unwrap_or_else<'tcx>(
27422742
expr: &'tcx hir::Expr<'_>,
27432743
map_args: &'tcx [hir::Expr<'_>],
27442744
unwrap_args: &'tcx [hir::Expr<'_>],
2745-
msrv: Option<&RustcVersion>
2745+
msrv: Option<&RustcVersion>,
27462746
) -> bool {
27472747
if !meets_msrv(msrv, &MAP_UNWRAP_OR_MSRV) {
27482748
return false;
2749-
}
2749+
}
27502750
// lint if the caller of `map()` is an `Option`
27512751
let is_option = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&map_args[0]), sym::option_type);
27522752
let is_result = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&map_args[0]), sym::result_type);
@@ -2932,7 +2932,12 @@ fn lint_filter_map<'tcx>(
29322932
const FILTER_MAP_NEXT_MSRV: RustcVersion = RustcVersion::new(1, 30, 0);
29332933

29342934
/// lint use of `filter_map().next()` for `Iterators`
2935-
fn lint_filter_map_next<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx hir::Expr<'_>, filter_args: &'tcx [hir::Expr<'_>], msrv: Option<&RustcVersion>) {
2935+
fn lint_filter_map_next<'tcx>(
2936+
cx: &LateContext<'tcx>,
2937+
expr: &'tcx hir::Expr<'_>,
2938+
filter_args: &'tcx [hir::Expr<'_>],
2939+
msrv: Option<&RustcVersion>,
2940+
) {
29362941
if match_trait_method(cx, expr, &paths::ITERATOR) {
29372942
if !meets_msrv(msrv, &FILTER_MAP_NEXT_MSRV) {
29382943
return;

‎clippy_lints/src/missing_const_for_fn.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
use crate::utils::qualify_min_const_fn::is_min_const_fn;
2-
use crate::utils::{meets_msrv, fn_has_unsatisfiable_preds, has_drop, is_entrypoint_fn, span_lint, trait_ref_of_method};
2+
use crate::utils::{
3+
fn_has_unsatisfiable_preds, has_drop, is_entrypoint_fn, meets_msrv, span_lint, trait_ref_of_method,
4+
};
35
use rustc_hir as hir;
46
use rustc_hir::intravisit::FnKind;
57
use rustc_hir::{Body, Constness, FnDecl, GenericParamKind, HirId};
6-
use rustc_lint::{LintContext, LateContext, LateLintPass};
8+
use rustc_lint::{LateContext, LateLintPass, LintContext};
79
use rustc_middle::lint::in_external_macro;
810
use rustc_semver::RustcVersion;
9-
use rustc_session::{impl_lint_pass, declare_tool_lint};
11+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1012
use rustc_span::Span;
1113
use rustc_typeck::hir_ty_to_ty;
1214

‎clippy_lints/src/ranges.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ use if_chain::if_chain;
33
use rustc_ast::ast::RangeLimits;
44
use rustc_errors::Applicability;
55
use rustc_hir::{BinOpKind, Expr, ExprKind, PathSegment, QPath};
6-
use rustc_lint::{LintContext, LateContext, LateLintPass};
6+
use rustc_lint::{LateContext, LateLintPass, LintContext};
77
use rustc_middle::ty;
88
use rustc_semver::RustcVersion;
9-
use rustc_session::{impl_lint_pass, declare_tool_lint};
9+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1010
use rustc_span::source_map::{Span, Spanned};
1111
use rustc_span::sym;
1212
use rustc_span::symbol::Ident;
1313
use std::cmp::Ordering;
1414

1515
use crate::utils::sugg::Sugg;
1616
use crate::utils::{
17-
get_parent_expr, is_integer_const, single_segment_path, snippet, snippet_opt, snippet_with_applicability,
18-
span_lint, span_lint_and_sugg, span_lint_and_then, meets_msrv
17+
get_parent_expr, is_integer_const, meets_msrv, single_segment_path, snippet, snippet_opt,
18+
snippet_with_applicability, span_lint, span_lint_and_sugg, span_lint_and_then,
1919
};
2020
use crate::utils::{higher, SpanlessEq};
2121

@@ -191,7 +191,7 @@ impl<'tcx> LateLintPass<'tcx> for Ranges {
191191
ExprKind::Binary(ref op, ref l, ref r) => {
192192
if meets_msrv(self.msrv.as_ref(), &MANUAL_RANGE_CONTAINS_MSRV) {
193193
check_possible_range_contains(cx, op.node, l, r, expr.span);
194-
}
194+
}
195195
},
196196
_ => {},
197197
}

‎clippy_lints/src/redundant_field_names.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_errors::Applicability;
44
use rustc_lint::{EarlyContext, EarlyLintPass};
55
use rustc_middle::lint::in_external_macro;
66
use rustc_semver::RustcVersion;
7-
use rustc_session::{impl_lint_pass, declare_tool_lint};
7+
use rustc_session::{declare_tool_lint, impl_lint_pass};
88

99
const REDUNDANT_FIELD_NAMES_MSRV: RustcVersion = RustcVersion::new(1, 17, 0);
1010

‎clippy_lints/src/redundant_static_lifetimes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_ast::ast::{Item, ItemKind, Ty, TyKind};
33
use rustc_errors::Applicability;
44
use rustc_lint::{EarlyContext, EarlyLintPass};
55
use rustc_semver::RustcVersion;
6-
use rustc_session::{impl_lint_pass, declare_tool_lint};
6+
use rustc_session::{declare_tool_lint, impl_lint_pass};
77

88
const REDUNDANT_STATIC_LIFETIMES_MSRV: RustcVersion = RustcVersion::new(1, 17, 0);
99

‎clippy_lints/src/use_self.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ use rustc_middle::lint::in_external_macro;
1313
use rustc_middle::ty;
1414
use rustc_middle::ty::{DefIdTree, Ty};
1515
use rustc_semver::RustcVersion;
16-
use rustc_session::{impl_lint_pass, declare_tool_lint};
16+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1717
use rustc_span::symbol::kw;
1818
use rustc_typeck::hir_ty_to_ty;
1919

20-
use crate::utils::{meets_msrv, differing_macro_contexts, span_lint_and_sugg};
20+
use crate::utils::{differing_macro_contexts, meets_msrv, span_lint_and_sugg};
2121

2222
declare_clippy_lint! {
2323
/// **What it does:** Checks for unnecessary repetition of structure name when a
@@ -222,7 +222,7 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
222222
}
223223
}
224224
}
225-
extract_msrv_attr!(LateContext);
225+
extract_msrv_attr!(LateContext);
226226
}
227227

228228
struct UseSelfVisitor<'a, 'tcx> {

‎tests/ui/min_rust_version_attr.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![feature(custom_inner_attributes)]
33
#![clippy::msrv = "1.0.0"]
44

5-
use std::ops::{RangeFrom, Deref};
5+
use std::ops::{Deref, RangeFrom};
66

77
fn option_as_ref_deref() {
88
let mut opt = Some(String::from("123"));
@@ -48,7 +48,7 @@ pub fn redundant_fieldnames() {
4848
}
4949

5050
pub fn redundant_static_lifetime() {
51-
const VAR_ONE: &'static str = "Test constant #1";
51+
const VAR_ONE: &'static str = "Test constant #1";
5252
}
5353

5454
pub fn checked_conversion() {
@@ -100,15 +100,16 @@ fn map_unwrap_or() {
100100

101101
// Check for `option.map(_).unwrap_or(_)` use.
102102
// Single line case.
103-
let _ = opt.map(|x| x + 1)
103+
let _ = opt
104+
.map(|x| x + 1)
104105
// Should lint even though this call is on a separate line.
105106
.unwrap_or(0);
106107
}
107108

108109
fn main() {
109110
filter_map_next();
110111
checked_conversion();
111-
redundant_fieldnames();
112+
redundant_fieldnames();
112113
redundant_static_lifetime();
113114
option_as_ref_deref();
114115
match_like_matches();
@@ -118,7 +119,7 @@ fn main() {
118119
manual_range_contains();
119120
use_self();
120121
replace_with_default();
121-
map_unwrap_or();
122+
map_unwrap_or();
122123
}
123124

124125
mod meets_msrv {

0 commit comments

Comments
 (0)