Skip to content

Commit 2abeac1

Browse files
committed
Auto merge of #7424 - dtolnay-contrib:macrobraces, r=llogiq
Downgrade nonstandard_macro_braces to nursery Due to the large number of crates impacted by #7422, I don't think this lint can be enabled by default right now until the false positive is fixed. --- changelog: remove [`nonstandard_macro_braces`] from default set of enabled lints
2 parents 61eb38a + 0f662e5 commit 2abeac1

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

clippy_lints/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
13751375
LintId::of(non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
13761376
LintId::of(non_expressive_names::MANY_SINGLE_CHAR_NAMES),
13771377
LintId::of(non_octal_unix_permissions::NON_OCTAL_UNIX_PERMISSIONS),
1378-
LintId::of(nonstandard_macro_braces::NONSTANDARD_MACRO_BRACES),
13791378
LintId::of(open_options::NONSENSICAL_OPEN_OPTIONS),
13801379
LintId::of(option_env_unwrap::OPTION_ENV_UNWRAP),
13811380
LintId::of(overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL),
@@ -1546,7 +1545,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15461545
LintId::of(non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST),
15471546
LintId::of(non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
15481547
LintId::of(non_expressive_names::MANY_SINGLE_CHAR_NAMES),
1549-
LintId::of(nonstandard_macro_braces::NONSTANDARD_MACRO_BRACES),
15501548
LintId::of(ptr::CMP_NULL),
15511549
LintId::of(ptr::PTR_ARG),
15521550
LintId::of(ptr_eq::PTR_EQ),
@@ -1791,6 +1789,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
17911789
LintId::of(missing_const_for_fn::MISSING_CONST_FOR_FN),
17921790
LintId::of(mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL),
17931791
LintId::of(mutex_atomic::MUTEX_INTEGER),
1792+
LintId::of(nonstandard_macro_braces::NONSTANDARD_MACRO_BRACES),
17941793
LintId::of(path_buf_push_overwrite::PATH_BUF_PUSH_OVERWRITE),
17951794
LintId::of(redundant_pub_crate::REDUNDANT_PUB_CRATE),
17961795
LintId::of(regex::TRIVIAL_REGEX),

clippy_lints/src/nonstandard_macro_braces.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ declare_clippy_lint! {
3131
/// vec![1, 2, 3];
3232
/// ```
3333
pub NONSTANDARD_MACRO_BRACES,
34-
style,
34+
nursery,
3535
"check consistent use of braces in macro"
3636
}
3737

tests/ui-toml/nonstandard_macro_braces/conf_nonstandard_macro_braces.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// #![warn(clippy::nonstandard_macro_braces)]
1+
#![warn(clippy::nonstandard_macro_braces)]
22

33
extern crate quote;
44

0 commit comments

Comments
 (0)