From 2ed0f516dd16c8111de0e0015d0ff42e312e2847 Mon Sep 17 00:00:00 2001 From: bobtwinkles Date: Tue, 6 Mar 2018 04:19:41 -0500 Subject: [PATCH] Check for two_phase_borrows in the right place Fix a small compilation issue after I missed a critical change after rebasing yesterday (ref c933440) --- src/librustc_mir/dataflow/impls/borrows.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/src/librustc_mir/dataflow/impls/borrows.rs index b7c95da09be..9a5221a3257 100644 --- a/src/librustc_mir/dataflow/impls/borrows.rs +++ b/src/librustc_mir/dataflow/impls/borrows.rs @@ -351,7 +351,7 @@ impl<'a, 'gcx, 'tcx> Borrows<'a, 'gcx, 'tcx> { /// allowed to be split into separate Reservation and /// Activation phases. fn allow_two_phase_borrow(&self, kind: mir::BorrowKind) -> bool { - self.tcx.sess.two_phase_borrows() && + self.tcx.two_phase_borrows() && (kind.allows_two_phase_borrow() || self.tcx.sess.opts.debugging_opts.two_phase_beyond_autoref) }