Sam's dev merge

Author: samueltardieu

.gitignore

@@ -46,6 +46,9 @@ helper.txt
 .vscode
 .idea
 
+# Emacs
+.dir-locals.el
+
 # mdbook generated output
 /book/book
 

CHANGELOG.md

@@ -6727,6 +6727,7 @@ Released 2018-09-13
 [`mut_mut`]: https://rust-lang.github.io/rust-clippy/master/index.html#mut_mut
 [`mut_mutex_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#mut_mutex_lock
 [`mut_range_bound`]: https://rust-lang.github.io/rust-clippy/master/index.html#mut_range_bound
+[`mutable_borrow_of_copy`]: https://rust-lang.github.io/rust-clippy/master/index.html#mutable_borrow_of_copy
 [`mutable_key_type`]: https://rust-lang.github.io/rust-clippy/master/index.html#mutable_key_type
 [`mutex_atomic`]: https://rust-lang.github.io/rust-clippy/master/index.html#mutex_atomic
 [`mutex_integer`]: https://rust-lang.github.io/rust-clippy/master/index.html#mutex_integer
@@ -6819,6 +6820,7 @@ Released 2018-09-13
 [`panic_params`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic_params
 [`panicking_overflow_checks`]: https://rust-lang.github.io/rust-clippy/master/index.html#panicking_overflow_checks
 [`panicking_unwrap`]: https://rust-lang.github.io/rust-clippy/master/index.html#panicking_unwrap
+[`parsed_string_literals`]: https://rust-lang.github.io/rust-clippy/master/index.html#parsed_string_literals
 [`partial_pub_fields`]: https://rust-lang.github.io/rust-clippy/master/index.html#partial_pub_fields
 [`partialeq_ne_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_ne_impl
 [`partialeq_to_none`]: https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_to_none
@@ -7041,6 +7043,7 @@ Released 2018-09-13
 [`uninit_vec`]: https://rust-lang.github.io/rust-clippy/master/index.html#uninit_vec
 [`uninlined_format_args`]: https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
 [`unit_arg`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_arg
+[`unit_as_impl_trait`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_as_impl_trait
 [`unit_cmp`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_cmp
 [`unit_hash`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_hash
 [`unit_return_expecting_ord`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_return_expecting_ord
@@ -7187,6 +7190,7 @@ Released 2018-09-13
 [`cargo-ignore-publish`]: https://doc.rust-lang.org/clippy/lint_configuration.html#cargo-ignore-publish
 [`check-incompatible-msrv-in-tests`]: https://doc.rust-lang.org/clippy/lint_configuration.html#check-incompatible-msrv-in-tests
 [`check-inconsistent-struct-field-initializers`]: https://doc.rust-lang.org/clippy/lint_configuration.html#check-inconsistent-struct-field-initializers
+[`check-mutable-borrow-of-copy-in-tests`]: https://doc.rust-lang.org/clippy/lint_configuration.html#check-mutable-borrow-of-copy-in-tests
 [`check-private-items`]: https://doc.rust-lang.org/clippy/lint_configuration.html#check-private-items
 [`cognitive-complexity-threshold`]: https://doc.rust-lang.org/clippy/lint_configuration.html#cognitive-complexity-threshold
 [`const-literal-digits-threshold`]: https://doc.rust-lang.org/clippy/lint_configuration.html#const-literal-digits-threshold

book/src/lint_configuration.md

@@ -472,6 +472,16 @@ fn main() {
 * [`inconsistent_struct_constructor`](https://rust-lang.github.io/rust-clippy/master/index.html#inconsistent_struct_constructor)
 
 
+## `check-mutable-borrow-of-copy-in-tests`
+Whether to search for mutable borrows of freshly copied data in tests.
+
+**Default Value:** `true`
+
+---
+**Affected lints:**
+* [`mutable_borrow_of_copy`](https://rust-lang.github.io/rust-clippy/master/index.html#mutable_borrow_of_copy)
+
+
 ## `check-private-items`
 Whether to also run the listed lints on private items.
 

clippy_config/src/conf.rs

@@ -567,6 +567,9 @@ define_Conf! {
     /// [from rust-clippy#11846]: https://github.com/rust-lang/rust-clippy/issues/11846#issuecomment-1820747924
     #[lints(inconsistent_struct_constructor)]
     check_inconsistent_struct_field_initializers: bool = false,
+    /// Whether to search for mutable borrows of freshly copied data in tests.
+    #[lints(mutable_borrow_of_copy)]
+    check_mutable_borrow_of_copy_in_tests: bool = true,
     /// Whether to also run the listed lints on private items.
     #[lints(missing_errors_doc, missing_panics_doc, missing_safety_doc, unnecessary_safety_doc)]
     check_private_items: bool = false,

clippy_dev/src/main.rs

@@ -39,6 +39,13 @@ fn main() {
             Err(e) => eprintln!("Unable to create lint: {e}"),
         },
         DevCommand::Setup(SetupCommand { subcommand }) => match subcommand {
+            SetupSubcommand::Emacs { remove, force_override } => {
+                if remove {
+                    setup::emacs::remove_dir_locals();
+                } else {
+                    setup::emacs::setup_dir_locals(force_override);
+                }
+            },
             SetupSubcommand::Intellij { remove, repo_path } => {
                 if remove {
                     setup::intellij::remove_rustc_src();
@@ -68,6 +75,7 @@ fn main() {
             },
         },
         DevCommand::Remove(RemoveCommand { subcommand }) => match subcommand {
+            RemoveSubcommand::Emacs => setup::emacs::remove_dir_locals(),
             RemoveSubcommand::Intellij => setup::intellij::remove_rustc_src(),
             RemoveSubcommand::GitHook => setup::git_hook::remove_hook(),
             RemoveSubcommand::VscodeTasks => setup::vscode::remove_tasks(),
@@ -276,6 +284,15 @@ struct SetupCommand {
 
 #[derive(Subcommand)]
 enum SetupSubcommand {
+    /// Add a `.dir-locals.el` so that Emacs can use `rustic-mode` and `eglot`
+    Emacs {
+        #[arg(long)]
+        /// Remove the `.dir-locals.el` file created by `cargo dev setup emacs`
+        remove: bool,
+        #[arg(long, short)]
+        /// Forces the override of an existing git pre-commit hook
+        force_override: bool,
+    },
     /// Alter dependencies so Intellij Rust can find rustc internals
     Intellij {
         #[arg(long)]
@@ -336,6 +353,8 @@ struct RemoveCommand {
 
 #[derive(Subcommand)]
 enum RemoveSubcommand {
+    /// Remove the `.dir-locals.el` file created by `cargo dev setup emacs`
+    Emacs,
     /// Remove the dependencies added with 'cargo dev setup intellij'
     Intellij,
     /// Remove the pre-commit git hook

clippy_dev/src/setup/emacs.rs

@@ -0,0 +1,30 @@
+const DIR_LOCALS_EL: &str = ".dir-locals.el";
+const DIR_LOCALS: &str = r#";; Emacs configuration
+((nil . ((eglot-workspace-configuration .
+           (:rust-analyzer
+            (:rustc
+             (:source "discover" :linkedProjects ["./Cargo.toml" "clippy_dev/Cargo.toml" "lintcheck/Cargo.toml"])
+             :cargo
+             (:features ["internal"]))))))
+ ("tests/ui" . ((auto-mode-alist ("\\.fixed\\'" . rustic-mode)))))
+"#;
+
+pub fn setup_dir_locals(force_override: bool) {
+    if !force_override && matches!(std::fs::exists(DIR_LOCALS_EL), Ok(true)) {
+        eprintln!("error: `{DIR_LOCALS_EL}` already exists");
+        return;
+    }
+    if std::fs::write(DIR_LOCALS_EL, DIR_LOCALS).is_err() {
+        eprintln!("error: unable to create file `{DIR_LOCALS_EL}`");
+        return;
+    }
+    println!("info: created `{DIR_LOCALS_EL}`");
+}
+
+pub fn remove_dir_locals() {
+    if std::fs::remove_file(DIR_LOCALS_EL).is_err() {
+        eprintln!("error: unable to remove `{DIR_LOCALS_EL}`");
+        return;
+    }
+    println!("info: removed `{DIR_LOCALS_EL}`");
+}

clippy_dev/src/setup/mod.rs

@@ -1,3 +1,4 @@
+pub mod emacs;
 pub mod git_hook;
 pub mod intellij;
 pub mod toolchain;

clippy_lints/src/casts/cast_nan_to_int.rs

@@ -21,9 +21,10 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, cast_expr: &Expr<'_>,
 
 fn is_known_nan(cx: &LateContext<'_>, e: &Expr<'_>) -> bool {
     match ConstEvalCtxt::new(cx).eval(e) {
-        // FIXME(f16_f128): add these types when nan checks are available on all platforms
+        Some(Constant::F128(n)) => n.is_nan(),
         Some(Constant::F64(n)) => n.is_nan(),
         Some(Constant::F32(n)) => n.is_nan(),
+        Some(Constant::F16(n)) => n.is_nan(),
         _ => false,
     }
 }

clippy_lints/src/collapsible_if.rs

@@ -1,7 +1,7 @@
 use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_hir_and_then;
 use clippy_utils::msrvs::Msrv;
-use clippy_utils::source::{IntoSpan as _, SpanRangeExt, snippet, snippet_block_with_applicability};
+use clippy_utils::source::{IntoSpan as _, SpanRangeExt as _, snippet, snippet_block_with_applicability};
 use clippy_utils::{can_use_if_let_chains, span_contains_non_whitespace, sym, tokenize_with_text};
 use rustc_ast::{BinOpKind, MetaItemInner};
 use rustc_errors::Applicability;

clippy_lints/src/declared_lints.rs

@@ -444,6 +444,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::methods::OPTION_MAP_OR_NONE_INFO,
     crate::methods::OR_FUN_CALL_INFO,
     crate::methods::OR_THEN_UNWRAP_INFO,
+    crate::methods::PARSED_STRING_LITERALS_INFO,
     crate::methods::PATH_BUF_PUSH_OVERWRITE_INFO,
     crate::methods::PATH_ENDS_WITH_EXT_INFO,
     crate::methods::PTR_OFFSET_BY_LITERAL_INFO,
@@ -535,6 +536,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::multiple_unsafe_ops_per_block::MULTIPLE_UNSAFE_OPS_PER_BLOCK_INFO,
     crate::mut_key::MUTABLE_KEY_TYPE_INFO,
     crate::mut_mut::MUT_MUT_INFO,
+    crate::mutable_borrow_of_copy::MUTABLE_BORROW_OF_COPY_INFO,
     crate::mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL_INFO,
     crate::mutex_atomic::MUTEX_ATOMIC_INFO,
     crate::mutex_atomic::MUTEX_INTEGER_INFO,
@@ -752,6 +754,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::unicode::UNICODE_NOT_NFC_INFO,
     crate::uninhabited_references::UNINHABITED_REFERENCES_INFO,
     crate::uninit_vec::UNINIT_VEC_INFO,
+    crate::unit_as_impl_trait::UNIT_AS_IMPL_TRAIT_INFO,
     crate::unit_return_expecting_ord::UNIT_RETURN_EXPECTING_ORD_INFO,
     crate::unit_types::LET_UNIT_VALUE_INFO,
     crate::unit_types::UNIT_ARG_INFO,