more default dotfiles, lint single char exts, reword config

Author: y21

CHANGELOG.md

@@ -5575,6 +5575,7 @@ Released 2018-09-13
 [`allow-one-hash-in-raw-strings`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-one-hash-in-raw-strings
 [`absolute-paths-max-segments`]: https://doc.rust-lang.org/clippy/lint_configuration.html#absolute-paths-max-segments
 [`absolute-paths-allowed-crates`]: https://doc.rust-lang.org/clippy/lint_configuration.html#absolute-paths-allowed-crates
-[`allowed-file-extensions`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allowed-file-extensions
+[`allowed-dotfiles`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allowed-dotfiles
 [`enforce-iter-loop-reborrow`]: https://doc.rust-lang.org/clippy/lint_configuration.html#enforce-iter-loop-reborrow
 <!-- end autogenerated links to configuration documentation -->
+mentation -->

book/src/lint_configuration.md

@@ -751,8 +751,8 @@ Which crates to allow absolute paths from
 * [`absolute_paths`](https://rust-lang.github.io/rust-clippy/master/index.html#absolute_paths)
 
 
-## `allowed-file-extensions`
-Additional file extensions to allow
+## `allowed-dotfiles`
+Additional dotfiles (files or directories starting with a dot) to allow
 
 **Default Value:** `{}` (`rustc_data_structures::fx::FxHashSet<String>`)
 

clippy_lints/src/lib.rs

@@ -661,24 +661,19 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     let allow_unwrap_in_tests = conf.allow_unwrap_in_tests;
     let suppress_restriction_lint_in_const = conf.suppress_restriction_lint_in_const;
     store.register_late_pass(move |_| Box::new(approx_const::ApproxConstant::new(msrv())));
-    let allowed_file_extensions = conf
-        .allowed_file_extensions
+    let allowed_dotfiles = conf
+        .allowed_dotfiles
         .iter()
         .cloned()
-        .chain(
-            methods::DEFAULT_ALLOWED_FILE_EXTENSIONS
-                .iter()
-                .copied()
-                .map(ToOwned::to_owned),
-        )
+        .chain(methods::DEFAULT_ALLOWED_DOTFILES.iter().copied().map(ToOwned::to_owned))
         .collect::<FxHashSet<_>>();
     store.register_late_pass(move |_| {
         Box::new(methods::Methods::new(
             avoid_breaking_exported_api,
             msrv(),
             allow_expect_in_tests,
             allow_unwrap_in_tests,
-            allowed_file_extensions.clone(),
+            allowed_dotfiles.clone(),
         ))
     });
     store.register_late_pass(move |_| Box::new(matches::Matches::new(msrv())));

clippy_lints/src/methods/mod.rs

@@ -121,7 +121,7 @@ use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::ty::{contains_ty_adt_constructor_opaque, implements_trait, is_copy, is_type_diagnostic_item};
 use clippy_utils::{contains_return, is_bool, is_trait_method, iter_input_pats, peel_blocks, return_ty};
 use if_chain::if_chain;
-pub use path_ends_with_ext::DEFAULT_ALLOWED_FILE_EXTENSIONS;
+pub use path_ends_with_ext::DEFAULT_ALLOWED_DOTFILES;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::{Expr, ExprKind, Node, Stmt, StmtKind, TraitItem, TraitItemKind};
@@ -3606,7 +3606,7 @@ pub struct Methods {
     msrv: Msrv,
     allow_expect_in_tests: bool,
     allow_unwrap_in_tests: bool,
-    allowed_file_extensions: FxHashSet<String>,
+    allowed_dotfiles: FxHashSet<String>,
 }
 
 impl Methods {
@@ -3616,14 +3616,14 @@ impl Methods {
         msrv: Msrv,
         allow_expect_in_tests: bool,
         allow_unwrap_in_tests: bool,
-        allowed_file_extensions: FxHashSet<String>,
+        allowed_dotfiles: FxHashSet<String>,
     ) -> Self {
         Self {
             avoid_breaking_exported_api,
             msrv,
             allow_expect_in_tests,
             allow_unwrap_in_tests,
-            allowed_file_extensions,
+            allowed_dotfiles,
         }
     }
 }
@@ -4020,7 +4020,7 @@ impl Methods {
                     if let ExprKind::MethodCall(.., span) = expr.kind {
                         case_sensitive_file_extension_comparisons::check(cx, expr, span, recv, arg);
                     }
-                    path_ends_with_ext::check(cx, recv, arg, expr, &self.msrv, &self.allowed_file_extensions);
+                    path_ends_with_ext::check(cx, recv, arg, expr, &self.msrv, &self.allowed_dotfiles);
                 },
                 ("expect", [_]) => {
                     match method_call(recv) {

clippy_lints/src/methods/path_ends_with_ext.rs

@@ -12,23 +12,26 @@ use rustc_lint::LateContext;
 use rustc_span::sym;
 use std::fmt::Write;
 
-pub const DEFAULT_ALLOWED_FILE_EXTENSIONS: &[&str] = &["git", "svn", "gem", "npm", "vim", "env", "rnd", "ssh", "vnc"];
+pub const DEFAULT_ALLOWED_DOTFILES: &[&str] = &[
+    "git", "svn", "gem", "npm", "vim", "env", "rnd", "ssh", "vnc", "smb", "nvm", "bin",
+];
 
 pub(super) fn check(
     cx: &LateContext<'_>,
     recv: &Expr<'_>,
     path: &Expr<'_>,
     expr: &Expr<'_>,
     msrv: &Msrv,
-    allowed_paths: &FxHashSet<String>,
+    allowed_dotfiles: &FxHashSet<String>,
 ) {
     if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv).peel_refs(), sym::Path)
         && !path.span.from_expansion()
         && let ExprKind::Lit(lit) = path.kind
         && let LitKind::Str(path, StrStyle::Cooked) = lit.node
         && let Some(path) = path.as_str().strip_prefix('.')
-        && (path.len() == 2 || path.len() == 3)
-        && !allowed_paths.contains(path)
+        && (1..=3).contains(&path.len())
+        && !allowed_dotfiles.contains(path)
+        && path.chars().all(char::is_alphanumeric)
     {
         let mut sugg = snippet(cx, recv.span, "..").into_owned();
         if msrv.meets(msrvs::OPTION_IS_SOME_AND) {

clippy_lints/src/utils/conf.rs

@@ -563,8 +563,8 @@ define_Conf! {
         rustc_data_structures::fx::FxHashSet::default()),
     /// Lint: PATH_ENDS_WITH_EXT.
     ///
-    /// Additional file extensions to allow
-    (allowed_file_extensions: rustc_data_structures::fx::FxHashSet<String> =
+    /// Additional dotfiles (files or directories starting with a dot) to allow
+    (allowed_dotfiles: rustc_data_structures::fx::FxHashSet<String> =
         rustc_data_structures::fx::FxHashSet::default()),
     /// Lint: EXPLICIT_ITER_LOOP
     ///

tests/ui/path_ends_with_ext.rs

@@ -17,9 +17,16 @@ fn test(path: &Path) {
     // most legitimate "dotfiles" are longer than 3 chars, so we allow them as well
     path.ends_with(".bashrc");
 
+    // argument from expn shouldn't trigger
     path.ends_with(arg!());
+
+    path.ends_with("..");
+    path.ends_with("./a");
+    path.ends_with(".");
+    path.ends_with("");
 }
 
+// is_some_and was stabilized in 1.70, so suggest map_or(false, ..) if under that
 #[clippy::msrv = "1.69"]
 fn under_msv(path: &Path) -> bool {
     path.ends_with(".md")