Rollup merge of #58670 - saleemjaffer:refactor_typecast_check_kinds, r=oli-obk

fixes rust-lang#52482

diff --cc src/librustc/ty/context.rs
Simple merge

diff --cc src/librustc_mir/hair/cx/expr.rs
index 6af45957acf0908984dedbe30f6efa6c05655423,ff5f3018acc08f1c0af116e28a23a1bc21db08b7..ad0a22cc7827c9f3e2163ebc2cdd8d63d5ca7586
--- 1/src/librustc_mir/hair/cx/expr.rs
--- 2/src/librustc_mir/hair/cx/expr.rs
+++ b/src/librustc_mir/hair/cx/expr.rs
@@@ -5,10 -5,9 +5,9 @@@ use crate::hair::cx::to_ref::ToRef
  use crate::hair::util::UserAnnotatedTyHelpers;
  use rustc_data_structures::indexed_vec::Idx;
  use rustc::hir::def::{Def, CtorKind};
 -use rustc::mir::interpret::{GlobalId, ErrorHandled};
 +use rustc::mir::interpret::{GlobalId, ErrorHandled, ConstValue};
  use rustc::ty::{self, AdtKind, Ty};
  use rustc::ty::adjustment::{Adjustment, Adjust, AutoBorrow, AutoBorrowMutability};
- use rustc::ty::cast::CastKind as TyCastKind;
  use rustc::ty::subst::{InternalSubsts, SubstsRef};
  use rustc::hir;
  use rustc::hir::def_id::LocalDefId;

diff --cc src/librustc_passes/rvalue_promotion.rs
Simple merge

diff --cc src/librustc_typeck/check/writeback.rs
Simple merge