Rebase fallout

oli-obk · oli-obk · commit bb5a652361bb · 2019-10-17T13:28:14.000+02:00
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -1400,7 +1400,7 @@ fn check_union_fields(tcx: TyCtxt<'_>, _: Span, item_def_id: DefId) -> bool {
         return true;
     }
     let item_type = tcx.type_of(item_def_id);
-    if let ty::Adt(def, substs) = item_type.sty {
+    if let ty::Adt(def, substs) = item_type.kind {
         if def.is_union() {
             let fields = &def.non_enum_variant().fields;
             for field in fields {

Original file line number	Diff line number	Diff line change
`@@ -1400,7 +1400,7 @@ fn check_union_fields(tcx: TyCtxt<'_>, _: Span, item_def_id: DefId) -> bool {`
`1400`	`1400`	`return true;`
`1401`	`1401`	`}`
`1402`	`1402`	`let item_type = tcx.type_of(item_def_id);`
`1403`		`- if let ty::Adt(def, substs) = item_type.sty {`
	`1403`	`+ if let ty::Adt(def, substs) = item_type.kind {`
`1404`	`1404`	`if def.is_union() {`
`1405`	`1405`	`let fields = &def.non_enum_variant().fields;`
`1406`	`1406`	`for field in fields {`