diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-10-31 11:41:54 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-10-31 12:41:41 -0400 |
| commit | d9fb792d7c259b76e51c1cbd6a7e5f9cee27ff99 (patch) | |
| tree | 0ef463f91b43dafc816fbcceb79c20036a939c92 | |
| parent | 99aa313636105ef4f79dde1ee566caff6bca41ca (diff) | |
| download | rust-d9fb792d7c259b76e51c1cbd6a7e5f9cee27ff99.tar.gz rust-d9fb792d7c259b76e51c1cbd6a7e5f9cee27ff99.zip | |
treat -Znll as implying -Zborrowck-mir
| -rw-r--r-- | src/librustc_mir/borrow_check.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc_mir/borrow_check.rs b/src/librustc_mir/borrow_check.rs index 8b5f1539ac0..819f67a39e9 100644 --- a/src/librustc_mir/borrow_check.rs +++ b/src/librustc_mir/borrow_check.rs @@ -51,7 +51,11 @@ fn mir_borrowck<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) { let src = MirSource::from_local_def_id(tcx, def_id); debug!("run query mir_borrowck: {}", tcx.node_path_str(src.item_id())); - if !tcx.has_attr(def_id, "rustc_mir_borrowck") && !tcx.sess.opts.debugging_opts.borrowck_mir { + if { + !tcx.has_attr(def_id, "rustc_mir_borrowck") && + !tcx.sess.opts.debugging_opts.borrowck_mir && + !tcx.sess.opts.debugging_opts.nll + } { return; } |