Fix merge conflict

diff --git a/src/librustc_mir/transform/type_check.rs b/src/librustc_mir/transform/type_check.rs
index f331d6252c6f5221200b26904a1c9e9242a57632..586c97e8e7b51f52618eab7f34b971fcd9ae3a0b 100644 (file)
--- a/src/librustc_mir/transform/type_check.rs
+++ b/src/librustc_mir/transform/type_check.rs
@@ -112,9 +112,9 @@ fn visit_mir(&mut self, mir: &Mir<'tcx>) {
 impl<'a, 'b, 'gcx, 'tcx> TypeVerifier<'a, 'b, 'gcx, 'tcx> {
     fn new(cx: &'a mut TypeChecker<'b, 'gcx, 'tcx>, mir: &'a Mir<'tcx>) -> Self {
         TypeVerifier {
-            cx,
             mir,
             body_id: cx.body_id,
+            cx,
             last_span: mir.span,
             errors_reported: false
         }