diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs index bff6aaab9b14..90c88a7b1c9f 100644 --- a/clippy_dev/src/update_lints.rs +++ b/clippy_dev/src/update_lints.rs @@ -329,12 +329,13 @@ fn gen_nightly_lint_list<'a>( internal_lints: impl Iterator, usable_lints: impl Iterator, ) -> String { - let details: Vec<_> = internal_lints + let mut details: Vec<_> = internal_lints .map(|l| (false, l)) .chain(usable_lints.map(|l| (true, l))) .filter(|(_, l)| l.version.as_ref().map_or(false, |v| v == "nightly")) .map(|(p, l)| (p, &l.module, l.name.to_uppercase())) .collect(); + details.sort_unstable(); let mut output = GENERATED_FILE_COMMENT.to_string(); output.push_str("clippy_utils::nightly::set_nightly_lints([\n"); diff --git a/clippy_lints/src/lib.nightly_lints.rs b/clippy_lints/src/lib.nightly_lints.rs index fb5b89e5b96f..22ccf47c49d1 100644 --- a/clippy_lints/src/lib.nightly_lints.rs +++ b/clippy_lints/src/lib.nightly_lints.rs @@ -5,8 +5,8 @@ clippy_utils::nightly::set_nightly_lints([ #[cfg(feature = "internal")] LintId::of(utils::internal_lints::FOREVER_NIGHTLY_LINT), - LintId::of(transmute::TRANSMUTE_UNDEFINED_REPR), LintId::of(borrow_as_ptr::BORROW_AS_PTR), - LintId::of(manual_bits::MANUAL_BITS), LintId::of(default_union_representation::DEFAULT_UNION_REPRESENTATION), + LintId::of(manual_bits::MANUAL_BITS), + LintId::of(transmute::TRANSMUTE_UNDEFINED_REPR), ]) diff --git a/clippy_utils/src/nightly.rs b/clippy_utils/src/nightly.rs index 8d2ecfcd19ec..43061e126993 100644 --- a/clippy_utils/src/nightly.rs +++ b/clippy_utils/src/nightly.rs @@ -69,6 +69,7 @@ pub fn is_nightly_lint(lint: &'static Lint) -> bool { /// This function checks if the given lint is a nightly lint and should be suppressed in the current /// context. +#[inline] pub fn suppress_lint(cx: &T, lint: &'static Lint) -> bool { if !is_nightly_run() && is_nightly_lint(lint) { let (_, level_src) = cx.get_lint_level(lint);