diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index 699292dbfaf..659c61d718c 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -19,7 +19,7 @@ use rustc_session::EarlyDiagCtxt; use rustc_span::edition::Edition; use rustc_target::spec::TargetTriple; -use crate::core::new_handler; +use crate::core::new_dcx; use crate::externalfiles::ExternalHtml; use crate::html; use crate::html::markdown::IdMap; @@ -348,7 +348,7 @@ impl Options { let codegen_options = CodegenOptions::build(handler, matches); let unstable_opts = UnstableOptions::build(handler, matches); - let diag = new_handler(error_format, None, diagnostic_width, &unstable_opts); + let diag = new_dcx(error_format, None, diagnostic_width, &unstable_opts); // check for deprecated options check_deprecated_options(matches, &diag); diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index b8567aa9a89..f014dcefbc7 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -123,8 +123,8 @@ impl<'tcx> DocContext<'tcx> { /// Creates a new `DiagCtxt` that can be used to emit warnings and errors. /// /// If the given `error_format` is `ErrorOutputType::Json` and no `SourceMap` is given, a new one -/// will be created for the handler. -pub(crate) fn new_handler( +/// will be created for the `DiagCtxt`. +pub(crate) fn new_dcx( error_format: ErrorOutputType, source_map: Option>, diagnostic_width: Option, diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index f26dd07293e..fb11ee30c3d 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -745,12 +745,8 @@ fn main_args( } }; - let diag = core::new_handler( - options.error_format, - None, - options.diagnostic_width, - &options.unstable_opts, - ); + let diag = + core::new_dcx(options.error_format, None, options.diagnostic_width, &options.unstable_opts); match (options.should_test, options.markdown_input()) { (true, true) => return wrap_return(&diag, markdown::test(options)),