Rename ty::TyKind to ty::TyData, Ty::kind to Ty::data

Author: vandenheuvel

compiler/rustc_codegen_llvm/src/builder.rs

@@ -307,7 +307,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         use rustc_ast::UintTy::*;
         use rustc_middle::ty::{Int, Uint};
 
-        let new_kind = match ty.kind() {
+        let new_kind = match ty.data() {
             Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.ptr_width)),
             Uint(t @ Usize) => Uint(t.normalize(self.tcx.sess.target.ptr_width)),
             t @ (Uint(_) | Int(_)) => t.clone(),

compiler/rustc_codegen_llvm/src/consts.rs

@@ -121,7 +121,7 @@ fn check_and_apply_linkage(
         // extern "C" fn() from being non-null, so we can't just declare a
         // static and call it a day. Some linkages (like weak) will make it such
         // that the static actually has a null value.
-        let llty2 = if let ty::RawPtr(ref mt) = ty.kind() {
+        let llty2 = if let ty::RawPtr(ref mt) = ty.data() {
             cx.layout_of(mt.ty).llvm_type(cx)
         } else {
             cx.sess().span_fatal(