about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2023-12-18 09:27:58 +1100
committerNicholas Nethercote <n.nethercote@gmail.com>2023-12-18 16:06:22 +1100
commite13b5c8efb9f743f1f6ebb23ed57f918aeda3910 (patch)
tree58b3e48b84bc02de02102eabd03a2389eb2d6b9f
parent7b8644e5cf7e43796b7dec7832b5c97df9e5cb15 (diff)
downloadrust-e13b5c8efb9f743f1f6ebb23ed57f918aeda3910.tar.gz
rust-e13b5c8efb9f743f1f6ebb23ed57f918aeda3910.zip
Rename `new_handler` as `new_dcx`.
-rw-r--r--src/librustdoc/config.rs4
-rw-r--r--src/librustdoc/core.rs4
-rw-r--r--src/librustdoc/lib.rs8
3 files changed, 6 insertions, 10 deletions
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<Lrc<source_map::SourceMap>>,
     diagnostic_width: Option<usize>,
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)),