about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-08-16 10:27:20 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-08-16 10:27:20 -0700
commit0697e4b17afbcf2b8d912a42d28c841aba07e088 (patch)
treed34eb2e1d0ed6a32de52fa33a92cf32be83fb0dc
parent1210ebff43d1f9a71668646c146917064731c499 (diff)
downloadrust-0697e4b17afbcf2b8d912a42d28c841aba07e088.tar.gz
rust-0697e4b17afbcf2b8d912a42d28c841aba07e088.zip
Fix merge conflict
-rw-r--r--src/librustc_mir/transform/type_check.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/transform/type_check.rs b/src/librustc_mir/transform/type_check.rs
index f331d6252c6..586c97e8e7b 100644
--- a/src/librustc_mir/transform/type_check.rs
+++ b/src/librustc_mir/transform/type_check.rs
@@ -112,9 +112,9 @@ impl<'a, 'b, 'gcx, 'tcx> Visitor<'tcx> for TypeVerifier<'a, 'b, 'gcx, '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
         }