Added type check and test case for string slice.

Author: Mason Ray Hanna III

clippy_lints/src/methods/path_join_correction.rs

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 use clippy_utils::{diagnostics::span_lint_and_sugg, ty::is_type_diagnostic_item};
 use rustc_ast::ast::LitKind;
 use rustc_errors::Applicability;
@@ -30,11 +31,14 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>, join_a
     );
 =======
 use clippy_utils::diagnostics::span_lint_and_sugg;
+=======
+use clippy_utils::{diagnostics::span_lint_and_sugg, ty::is_type_diagnostic_item};
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
 use rustc_ast::ast::LitKind;
 use rustc_errors::Applicability;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::LateContext;
-use rustc_span::Span;
+use rustc_span::{symbol::sym::Path, Span};
 
 use super::PATH_JOIN_CORRECTION;
 
@@ -66,22 +70,30 @@ pub(super) fn check<'tcx>(
 >>>>>>> 9048d99eb (Added new lint for issue #10655)
 =======
 pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>, join_arg: &'tcx Expr<'tcx>, span: Span) {
-    let applicability = Applicability::MachineApplicable;
-    if_chain!(
-      if let ExprKind::Lit(spanned) = &join_arg.kind;
-      if let LitKind::Str(symbol, _) = spanned.node;
-      if symbol.as_str().starts_with('/');
-      then {
-        span_lint_and_sugg(
-      cx,
-      PATH_JOIN_CORRECTION,
-      span.with_hi(expr.span.hi()),
-      r#"argument in join called on path contains a starting '/'"#,
-      "try removing first '/'",
-      "join(\"your/path/here\")".to_owned(),
-      applicability
+    let ty = cx.typeck_results().expr_ty(expr);
+    if is_type_diagnostic_item(cx, ty, Path) {
+        let applicability = Applicability::MachineApplicable;
+        if_chain!(
+         if let ExprKind::Lit(spanned) = &join_arg.kind;
+         if let LitKind::Str(symbol, _) = spanned.node;
+         if symbol.as_str().starts_with('/');
+          then {
+           span_lint_and_sugg(
+           cx,
+           PATH_JOIN_CORRECTION,
+           span.with_hi(expr.span.hi()),
+           r#"argument in join called on path contains a starting '/'"#,
+           "try removing first '/'",
+           "join(\"your/path/here\")".to_owned(),
+           applicability
+         );
+        }
         );
+<<<<<<< HEAD
       }
     );
 >>>>>>> b87b08b12 (Fixed errors and lack of documentation in mod.rs.)
+=======
+    }
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
 }

tests/ui/path_join_correction.fixed

@@ -2,6 +2,7 @@
 #![allow(unused)]
 #![warn(clippy::path_join_correction)]
 <<<<<<< HEAD
+<<<<<<< HEAD
 use std::path::Path;
 
 fn main() {
@@ -23,16 +24,29 @@ fn main() {
     //should not be linted
     let path = Path::new("/bin");
 =======
+=======
+use std::path::Path;
+//use std::string::String;
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
 
 fn main() {
     // should be linted
-    let path = std::path::Path::new("/bin");
-    path.join("your/path/here");
+    let path = Path::new("/bin");
+    path.join("/sh");
     println!("{}", path.display());
 
+    // should not be linted
+    let path: &[&str] = &["/bin"];
+    path.join("/sh");
+    println!("{:?}", path);
+
     //should not be linted
+<<<<<<< HEAD
     let path = std::path::Path::new("/bin");
 >>>>>>> b87b08b12 (Fixed errors and lack of documentation in mod.rs.)
+=======
+    let path = Path::new("/bin");
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
     path.join("sh");
     println!("{}", path.display());
 }

tests/ui/path_join_correction.rs

@@ -4,6 +4,7 @@
 #![allow(unused)]
 #![warn(clippy::path_join_correction)]
 use std::path::Path;
+<<<<<<< HEAD
 
 fn main() {
     // should be linted
@@ -31,13 +32,17 @@ fn main() {
 >>>>>>> b87b08b12 (Fixed errors and lack of documentation in mod.rs.)
 #![allow(unused)]
 #![warn(clippy::path_join_correction)]
+=======
+//use std::string::String;
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
 
 fn main() {
     // should be linted
-    let path = std::path::Path::new("/bin");
+    let path = Path::new("/bin");
     path.join("/sh");
     println!("{}", path.display());
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   //should not be linted
   let path = std::path::Path::new("/bin");
@@ -46,8 +51,15 @@ fn main() {
 
 >>>>>>> 9048d99eb (Added new lint for issue #10655)
 =======
+=======
+    // should not be linted
+    let path: &[&str] = &["/bin"];
+    path.join("/sh");
+    println!("{:?}", path);
+
+>>>>>>> 00ee1bf71 (Added type check and test case for string slice.)
     //should not be linted
-    let path = std::path::Path::new("/bin");
+    let path = Path::new("/bin");
     path.join("sh");
     println!("{}", path.display());
 >>>>>>> b87b08b12 (Fixed errors and lack of documentation in mod.rs.)