Use Ty instead of TyS

Summary:
Ty became an Intern of TyS

use Ty type

rust-lang/rust@e9a0c42

Reviewed By: ndmitchell

Differential Revision: D35597415

fbshipit-source-id: eb1aa08e5efcc0336a9f8aac3fdd79502e833455

Author: bobyangyf

gazebo_lint/src/clippy.rs

@@ -22,7 +22,7 @@ use rustc_infer::infer::TyCtxtInferExt;
 use rustc_lint::LateContext;
 use rustc_middle::{
     traits,
-    ty::{subst::GenericArg, Ty, TyKind, TyS},
+    ty::{subst::GenericArg, Ty, TyKind},
 };
 use rustc_span::{self, symbol::Symbol, Span};
 use rustc_trait_selection::traits::{
@@ -188,12 +188,7 @@ pub fn match_def_path(cx: &LateContext, did: DefId, syms: &[&str]) -> bool {
 }
 
 /// Matches the given `ty` with generics to the given types and generic types
-pub fn match_ty_path(
-    cx: &LateContext,
-    ty: &TyS,
-    ty_path: &[&str],
-    generic_tys: &[&[&str]],
-) -> bool {
+pub fn match_ty_path(cx: &LateContext, ty: Ty, ty_path: &[&str], generic_tys: &[&[&str]]) -> bool {
     if let TyKind::Adt(ty, subst) = ty.kind() {
         if match_def_path(cx, ty.did, ty_path) {
             let mut i = 0;

gazebo_lint/src/lib.rs

@@ -319,7 +319,7 @@ fn check_use_dupe(cx: &LateContext, expr: &Expr) {
                     // could also be a valid `dupe` call. So, try de-referencing the type once and
                     // check for `Dupe` on `Foo` as well.
                     if let TyKind::Ref(_, inner_ty, _) = cloned_type.kind() {
-                        cloned_type = inner_ty;
+                        cloned_type = *inner_ty;
                     } else {
                         break;
                     }
@@ -353,7 +353,7 @@ fn check_use_duped(cx: &LateContext, expr: &Expr) {
                     // could also be a valid `dupe` call. So, try de-referencing the type once and
                     // check for `Dupe` on `Foo` as well.
                     if let TyKind::Ref(_, inner_ty, _) = cloned_type.kind() {
-                        cloned_type = inner_ty;
+                        cloned_type = *inner_ty;
                     } else {
                         break;
                     }
@@ -388,7 +388,7 @@ fn check_dupe_on_copy(cx: &LateContext, expr: &Expr) {
                         // could also be a valid `dupe` call. So, try de-referencing the type once
                         // and check for `Copy` on `Foo` as well.
                         if let TyKind::Ref(_, inner_ty, _) = duped_type.kind() {
-                            duped_type = inner_ty;
+                            duped_type = *inner_ty;
                         } else {
                             break;
                         }