Resolved rest of changes.

Author: ofeeg

clippy_lints/src/methods/join_absolute_paths.rs

@@ -1,8 +1,6 @@
-use clippy_utils::diagnostics::span_lint_and_sugg;
-use clippy_utils::macros::HirNode;
+use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::ty::is_type_diagnostic_item;
 use rustc_ast::ast::LitKind;
-use rustc_errors::Applicability;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::LateContext;
 use rustc_span::symbol::sym::Path;
@@ -11,19 +9,19 @@ use super::JOIN_ABSOLUTE_PATHS;
 
 pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>, join_arg: &'tcx Expr<'tcx>) {
     let ty = cx.typeck_results().expr_ty(expr).peel_refs();
-    if !expr.span.from_expansion() && is_type_diagnostic_item(cx, ty, Path) {
-        let applicability = Applicability::MachineApplicable;
-        if let ExprKind::Lit(spanned) = &join_arg.kind && let LitKind::Str(symbol, _) = spanned.node
-      && (symbol.as_str().starts_with('/') || symbol.as_str().starts_with('\\')) {
-        span_lint_and_sugg(
-          cx,
-          JOIN_ABSOLUTE_PATHS,
-          join_arg.span().with_hi(expr.span.hi()),
-          r#"argument to `Path::join` starts with a path separator"#,
-          "try removing first '/' or '\\'",
-          "join(\"your/path/here\")".to_owned(),
-          applicability,
-        );
-      }
+    if !expr.span.from_expansion() && is_type_diagnostic_item(cx, ty, Path)
+    && let ExprKind::Lit(spanned) = &join_arg.kind && let LitKind::Str(symbol, _) = spanned.node
+    && (symbol.as_str().starts_with('/') || symbol.as_str().starts_with('\\')) {
+      span_lint_and_then(
+        cx,
+        JOIN_ABSOLUTE_PATHS,
+        join_arg.span,
+        "argument to `Path::join` starts with a path separator",
+        |diag| {
+          diag.note("joining a path starting with separator will replace the path instead");
+          diag.help(r#"if this is unintentional, try removing the starting separator"#);
+          diag.help(r#"if this is intentional, try creating a new Path instead"#);
+        },
+      );
     };
 }

clippy_lints/src/methods/join_absolute_paths.rs~

@@ -3267,16 +3267,17 @@ declare_clippy_lint! {
     /// Checks for calls to `Path::join` that start with a path separator, like `\\` or `/`..
     ///
     /// ### Why is this bad?
-    /// `.join()` comments starting with a separator  (`/` or `\\`) can replace the entire path.
-    /// If this is intentional, prefer creating a new `Path` instead.
+    /// `.join()` arguments starting with a separator  (`/` or `\\`) can replace the entire path.
+    /// If this is intentional, prefer using `Path::new()` instead.
     ///
     /// See [`Path::join()`](https://doc.rust-lang.org/std/path/struct.Path.html#method.join)
     ///
     /// ### Example
     /// ```rust
-    /// let path = std::path::Path::new("/bin");
-    /// let res = path.join("/sh");
-    /// assert_eq!(res, std::path::PathBuf::from("/sh"));
+    /// # use std::path::{Path, PathBuf};
+    /// let path = Path::new("/bin");
+    /// let joined_path = path.join("/sh");
+    /// assert_eq!(joined_path, PathBuf::from("/sh"));
     /// ```
     ///
     /// Use instead;

clippy_lints/src/methods/mod.rs

@@ -1,16 +1,23 @@
 error: argument to `Path::join` starts with a path separator
-  --> $DIR/join_absolute_paths.rs:8:9
+  --> $DIR/join_absolute_paths.rs:8:15
    |
 LL |     path.join("/sh");
-   |         ^^^^^^ help: try removing first '/' or '/': `join("your/path/here")`
+   |               ^^^^^
    |
+   = note: joining a path starting with separator will replace the path instead
+   = help: if this is unintentional, try removing the starting separator
+   = help: if this is intentional, try creating a new Path instead
    = note: `-D clippy::join-absolute-paths` implied by `-D warnings`
 
 error: argument to `Path::join` starts with a path separator
-  --> $DIR/join_absolute_paths.rs:13:9
+  --> $DIR/join_absolute_paths.rs:13:15
    |
 LL |     path.join("//user");
-   |         ^^^^^^ help: try removing first '/' or '/': `join("your/path/here")`
+   |               ^^^^^^^^
+   |
+   = note: joining a path starting with separator will replace the path instead
+   = help: if this is unintentional, try removing the starting separator
+   = help: if this is intentional, try creating a new Path instead
 
 error: aborting due to 2 previous errors