From 95b6148e31ff6482491dc955b09a5645780f0ea7 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 19 Dec 2017 15:08:40 -0300 Subject: [PATCH] Add nll_dump_cause helper to Session --- src/librustc/session/mod.rs | 3 +++ src/librustc_mir/borrow_check/nll/region_infer/mod.rs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index a9200a3c8059..8f41a2d62327 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -437,6 +437,9 @@ impl Session { pub fn print_llvm_passes(&self) -> bool { self.opts.debugging_opts.print_llvm_passes } + pub fn nll_dump_cause(&self) -> bool { + self.opts.debugging_opts.nll_dump_cause + } pub fn emit_end_regions(&self) -> bool { self.opts.debugging_opts.emit_end_regions || (self.opts.debugging_opts.mir_emit_validate > 0) || diff --git a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs index 30ce17b6c6a6..da136a34b997 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs @@ -248,7 +248,7 @@ impl<'tcx> RegionInferenceContext<'tcx> { .map(|origin| RegionDefinition::new(origin)) .collect(); - let nll_dump_cause = ty::tls::with(|tcx| tcx.sess.opts.debugging_opts.nll_dump_cause); + let nll_dump_cause = ty::tls::with(|tcx| tcx.sess.nll_dump_cause()); let mut result = Self { definitions, @@ -1259,7 +1259,7 @@ impl Cause { pub(crate) fn label_diagnostic(&self, mir: &Mir<'_>, diag: &mut DiagnosticBuilder<'_>) { // The cause information is pretty messy. Only dump it as an // internal debugging aid if -Znll-dump-cause is given. - let nll_dump_cause = ty::tls::with(|tcx| tcx.sess.opts.debugging_opts.nll_dump_cause); + let nll_dump_cause = ty::tls::with(|tcx| tcx.sess.nll_dump_cause()); if !nll_dump_cause { return; }