diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-12-18 11:15:13 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-12-18 16:06:22 +1100 |
| commit | d165a38de033c54e27ab89faca97cbab24d5e6f5 (patch) | |
| tree | 60b109c96c78ebb58da2f16d86bd3decb0371ff8 | |
| parent | bc3a3bcf0c6c06666a502bb370ba9c7e9b119f64 (diff) | |
| download | rust-d165a38de033c54e27ab89faca97cbab24d5e6f5.tar.gz rust-d165a38de033c54e27ab89faca97cbab24d5e6f5.zip | |
Rename many `DiagCtxt` and `EarlyDiagCtxt` locals.
| -rw-r--r-- | clippy_lints/src/doc/needless_doctest_main.rs | 4 | ||||
| -rw-r--r-- | src/driver.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clippy_lints/src/doc/needless_doctest_main.rs b/clippy_lints/src/doc/needless_doctest_main.rs index b2ac39a8e9f..c639813a3f9 100644 --- a/clippy_lints/src/doc/needless_doctest_main.rs +++ b/clippy_lints/src/doc/needless_doctest_main.rs @@ -45,10 +45,10 @@ pub fn check( let fallback_bundle = rustc_errors::fallback_fluent_bundle(rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(), false); let emitter = EmitterWriter::new(Box::new(io::sink()), fallback_bundle); - let handler = DiagCtxt::with_emitter(Box::new(emitter)).disable_warnings(); + let dcx = DiagCtxt::with_emitter(Box::new(emitter)).disable_warnings(); #[expect(clippy::arc_with_non_send_sync)] // `Lrc` is expected by with_dcx let sm = Lrc::new(SourceMap::new(FilePathMapping::empty())); - let sess = ParseSess::with_dcx(handler, sm); + let sess = ParseSess::with_dcx(dcx, sm); let mut parser = match maybe_new_parser_from_source_str(&sess, filename, code) { Ok(p) => p, diff --git a/src/driver.rs b/src/driver.rs index af38dde254e..b944a299256 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -174,9 +174,9 @@ const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/ne #[allow(clippy::too_many_lines)] #[allow(clippy::ignored_unit_patterns)] pub fn main() { - let handler = EarlyDiagCtxt::new(ErrorOutputType::default()); + let early_dcx = EarlyDiagCtxt::new(ErrorOutputType::default()); - rustc_driver::init_rustc_env_logger(&handler); + rustc_driver::init_rustc_env_logger(&early_dcx); let using_internal_features = rustc_driver::install_ice_hook(BUG_REPORT_URL, |handler| { // FIXME: this macro calls unwrap internally but is called in a panicking context! It's not |
