ty::TyKind::X -> ty::X

Author: y21

clippy_lints/src/methods/read_line_without_trim.rs

@@ -9,18 +9,15 @@ use rustc_hir::Expr;
 use rustc_hir::QPath;
 use rustc_hir::{def::Res, ExprKind};
 use rustc_lint::LateContext;
-use rustc_middle::ty::{Ty, TyKind};
+use rustc_middle::ty::{self, Ty};
 use rustc_span::sym;
 
 use super::READ_LINE_WITHOUT_TRIM;
 
 /// Will a `.parse::<ty>()` call fail if the input has a trailing newline?
 fn parse_fails_on_trailing_newline(ty: Ty<'_>) -> bool {
     // only allow a very limited set of types for now, for which we 100% know parsing will fail
-    matches!(
-        ty.kind(),
-        TyKind::Float(_) | TyKind::Bool | TyKind::Int(_) | TyKind::Uint(_)
-    )
+    matches!(ty.kind(), ty::Float(_) | ty::Bool | ty::Int(_) | ty::Uint(_))
 }
 
 pub fn check(cx: &LateContext<'_>, call: &Expr<'_>, recv: &Expr<'_>, arg: &Expr<'_>) {
@@ -38,7 +35,7 @@ pub fn check(cx: &LateContext<'_>, call: &Expr<'_>, recv: &Expr<'_>, arg: &Expr<
                 && segment.ident.name == sym!(parse)
                 && let parse_result_ty = cx.typeck_results().expr_ty(parent)
                 && is_type_diagnostic_item(cx, parse_result_ty, sym::Result)
-                && let TyKind::Adt(_, substs) = parse_result_ty.kind()
+                && let ty::Adt(_, substs) = parse_result_ty.kind()
                 && let Some(ok_ty) = substs[0].as_type()
                 && parse_fails_on_trailing_newline(ok_ty)
             {