diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 759e32abd60c..ac9c6ee91906 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1122,7 +1122,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, "treat all errors that occur as bugs"), external_macro_backtrace: bool = (false, parse_bool, [UNTRACKED], "show macro backtraces even for non-local macros"), - explain: bool = (false, parse_bool, [TRACKED], + teach: bool = (false, parse_bool, [TRACKED], "show extended diagnostic help"), continue_parse_after_error: bool = (false, parse_bool, [TRACKED], "attempt to recover from parse errors (experimental)"), diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 995aef51cade..4eff090b83ea 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -832,8 +832,8 @@ impl Session { } } - pub fn explain(&self, code: &DiagnosticId) -> bool { - self.opts.debugging_opts.explain && !self.parse_sess.span_diagnostic.code_emitted(code) + pub fn teach(&self, code: &DiagnosticId) -> bool { + self.opts.debugging_opts.teach && !self.parse_sess.span_diagnostic.code_emitted(code) } } diff --git a/src/librustc_typeck/structured_errors.rs b/src/librustc_typeck/structured_errors.rs index e9b96ed2d643..afcdc7575a3c 100644 --- a/src/librustc_typeck/structured_errors.rs +++ b/src/librustc_typeck/structured_errors.rs @@ -22,7 +22,7 @@ pub trait StructuredDiagnostic<'tcx> { fn diagnostic(&self) -> DiagnosticBuilder<'tcx> { let err = self.common(); - if self.session().explain(&self.code()) { + if self.session().teach(&self.code()) { self.extended(err) } else { self.regular(err)