diff options
| author | bobtwinkles <srkoser+github@gmail.com> | 2018-03-06 04:19:41 -0500 |
|---|---|---|
| committer | bobtwinkles <srkoser+github@gmail.com> | 2018-03-09 13:54:26 -0500 |
| commit | 2ed0f516dd16c8111de0e0015d0ff42e312e2847 (patch) | |
| tree | 6c7b7f986951bad1ceeacb730a6fbf8859ef76f7 | |
| parent | 03f198fcee46b49a69845784c313433496f7cf0e (diff) | |
| download | rust-2ed0f516dd16c8111de0e0015d0ff42e312e2847.tar.gz rust-2ed0f516dd16c8111de0e0015d0ff42e312e2847.zip | |
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)
| -rw-r--r-- | src/librustc_mir/dataflow/impls/borrows.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |
