Skip to content

Commit cdd7afe

Browse files
committed
Auto merge of rust-lang#103654 - flip1995:clippy_backport, r=Manishearth
Move clippy::uninlined_format_args back to pedantic Before `beta` is branched tomorrow we want to move this lint back to `pedantic` so that it is not enabled by default. Clippy PR: rust-lang/rust-clippy#9728 Zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/257328-clippy/topic/.60uninlined_format_args.60.20category/near/306306974 r? `@Manishearth`
2 parents 126dbdc + 3f24108 commit cdd7afe

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

src/tools/clippy/clippy_lints/src/format_args.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ declare_clippy_lint! {
115115
/// nothing will be suggested, e.g. `println!("{0}={1}", var, 1+2)`.
116116
#[clippy::version = "1.65.0"]
117117
pub UNINLINED_FORMAT_ARGS,
118-
style,
118+
pedantic,
119119
"using non-inlined variables in `format!` calls"
120120
}
121121

src/tools/clippy/clippy_lints/src/lib.register_all.rs

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
7272
LintId::of(format::USELESS_FORMAT),
7373
LintId::of(format_args::FORMAT_IN_FORMAT_ARGS),
7474
LintId::of(format_args::TO_STRING_IN_FORMAT_ARGS),
75-
LintId::of(format_args::UNINLINED_FORMAT_ARGS),
7675
LintId::of(format_args::UNUSED_FORMAT_SPECS),
7776
LintId::of(format_impl::PRINT_IN_FORMAT_IMPL),
7877
LintId::of(format_impl::RECURSIVE_FORMAT_IMPL),

src/tools/clippy/clippy_lints/src/lib.register_pedantic.rs

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ store.register_group(true, "clippy::pedantic", Some("clippy_pedantic"), vec![
2929
LintId::of(eta_reduction::REDUNDANT_CLOSURE_FOR_METHOD_CALLS),
3030
LintId::of(excessive_bools::FN_PARAMS_EXCESSIVE_BOOLS),
3131
LintId::of(excessive_bools::STRUCT_EXCESSIVE_BOOLS),
32+
LintId::of(format_args::UNINLINED_FORMAT_ARGS),
3233
LintId::of(functions::MUST_USE_CANDIDATE),
3334
LintId::of(functions::TOO_MANY_LINES),
3435
LintId::of(if_not_else::IF_NOT_ELSE),

src/tools/clippy/clippy_lints/src/lib.register_style.rs

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ store.register_group(true, "clippy::style", Some("clippy_style"), vec![
2525
LintId::of(enum_variants::MODULE_INCEPTION),
2626
LintId::of(eta_reduction::REDUNDANT_CLOSURE),
2727
LintId::of(float_literal::EXCESSIVE_PRECISION),
28-
LintId::of(format_args::UNINLINED_FORMAT_ARGS),
2928
LintId::of(from_over_into::FROM_OVER_INTO),
3029
LintId::of(from_str_radix_10::FROM_STR_RADIX_10),
3130
LintId::of(functions::DOUBLE_MUST_USE),

0 commit comments

Comments
 (0)