Skip to content

Commit cb9abca

Browse files
nnethercotennethercote
committed
Rename EmitterWriter as HumanEmitter.
For consistency with other `Emitter` impls, such as `JsonEmitter`, `SilentEmitter`, `SharedEmitter`, etc.
1 parent e51e98d commit cb9abca

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

‎compiler/rustc_driver_impl/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ fn report_ice(
13931393
) {
13941394
let fallback_bundle =
13951395
rustc_errors::fallback_fluent_bundle(crate::DEFAULT_LOCALE_RESOURCES.to_vec(), false);
1396-
let emitter = Box::new(rustc_errors::emitter::EmitterWriter::stderr(
1396+
let emitter = Box::new(rustc_errors::emitter::HumanEmitter::stderr(
13971397
rustc_errors::ColorConfig::Auto,
13981398
fallback_bundle,
13991399
));

‎compiler/rustc_errors/src/emitter.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ impl HumanReadableErrorType {
6161
self,
6262
mut dst: Box<dyn WriteColor + Send>,
6363
fallback_bundle: LazyFallbackBundle,
64-
) -> EmitterWriter {
64+
) -> HumanEmitter {
6565
let (short, color_config) = self.unzip();
6666
let color = color_config.suggests_using_colors();
6767
if !dst.supports_color() && color {
6868
dst = Box::new(Ansi::new(dst));
6969
}
70-
EmitterWriter::new(dst, fallback_bundle).short_message(short)
70+
HumanEmitter::new(dst, fallback_bundle).short_message(short)
7171
}
7272
}
7373

@@ -501,7 +501,7 @@ pub trait Emitter: Translate {
501501
}
502502
}
503503

504-
impl Translate for EmitterWriter {
504+
impl Translate for HumanEmitter {
505505
fn fluent_bundle(&self) -> Option<&Lrc<FluentBundle>> {
506506
self.fluent_bundle.as_ref()
507507
}
@@ -511,7 +511,7 @@ impl Translate for EmitterWriter {
511511
}
512512
}
513513

514-
impl Emitter for EmitterWriter {
514+
impl Emitter for HumanEmitter {
515515
fn source_map(&self) -> Option<&Lrc<SourceMap>> {
516516
self.sm.as_ref()
517517
}
@@ -622,7 +622,7 @@ impl ColorConfig {
622622

623623
/// Handles the writing of `HumanReadableErrorType::Default` and `HumanReadableErrorType::Short`
624624
#[derive(Setters)]
625-
pub struct EmitterWriter {
625+
pub struct HumanEmitter {
626626
#[setters(skip)]
627627
dst: IntoDynSyncSend<Destination>,
628628
sm: Option<Lrc<SourceMap>>,
@@ -647,14 +647,14 @@ pub struct FileWithAnnotatedLines {
647647
multiline_depth: usize,
648648
}
649649

650-
impl EmitterWriter {
651-
pub fn stderr(color_config: ColorConfig, fallback_bundle: LazyFallbackBundle) -> EmitterWriter {
650+
impl HumanEmitter {
651+
pub fn stderr(color_config: ColorConfig, fallback_bundle: LazyFallbackBundle) -> HumanEmitter {
652652
let dst = from_stderr(color_config);
653653
Self::create(dst, fallback_bundle)
654654
}
655655

656-
fn create(dst: Destination, fallback_bundle: LazyFallbackBundle) -> EmitterWriter {
657-
EmitterWriter {
656+
fn create(dst: Destination, fallback_bundle: LazyFallbackBundle) -> HumanEmitter {
657+
HumanEmitter {
658658
dst: IntoDynSyncSend(dst),
659659
sm: None,
660660
fluent_bundle: None,
@@ -673,7 +673,7 @@ impl EmitterWriter {
673673
pub fn new(
674674
dst: Box<dyn WriteColor + Send>,
675675
fallback_bundle: LazyFallbackBundle,
676-
) -> EmitterWriter {
676+
) -> HumanEmitter {
677677
Self::create(dst, fallback_bundle)
678678
}
679679

‎compiler/rustc_errors/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub use snippet::Style;
5353
pub use termcolor::{Color, ColorSpec, WriteColor};
5454

5555
use crate::diagnostic_impls::{DelayedAtWithNewline, DelayedAtWithoutNewline};
56-
use emitter::{is_case_difference, DynEmitter, Emitter, EmitterWriter};
56+
use emitter::{is_case_difference, DynEmitter, Emitter, HumanEmitter};
5757
use registry::Registry;
5858
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
5959
use rustc_data_structures::stable_hasher::{Hash128, StableHasher};
@@ -574,7 +574,7 @@ impl DiagCtxt {
574574
sm: Option<Lrc<SourceMap>>,
575575
fallback_bundle: LazyFallbackBundle,
576576
) -> Self {
577-
let emitter = Box::new(EmitterWriter::stderr(ColorConfig::Auto, fallback_bundle).sm(sm));
577+
let emitter = Box::new(HumanEmitter::stderr(ColorConfig::Auto, fallback_bundle).sm(sm));
578578
Self::with_emitter(emitter)
579579
}
580580
pub fn disable_warnings(mut self) -> Self {

‎compiler/rustc_expand/src/tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_span::source_map::{FilePathMapping, SourceMap};
77
use rustc_span::{BytePos, Span};
88

99
use rustc_data_structures::sync::Lrc;
10-
use rustc_errors::emitter::EmitterWriter;
10+
use rustc_errors::emitter::HumanEmitter;
1111
use rustc_errors::{DiagCtxt, MultiSpan, PResult};
1212
use termcolor::WriteColor;
1313

@@ -30,7 +30,7 @@ fn create_test_handler() -> (DiagCtxt, Lrc<SourceMap>, Arc<Mutex<Vec<u8>>>) {
3030
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
3131
false,
3232
);
33-
let emitter = EmitterWriter::new(Box::new(Shared { data: output.clone() }), fallback_bundle)
33+
let emitter = HumanEmitter::new(Box::new(Shared { data: output.clone() }), fallback_bundle)
3434
.sm(Some(source_map.clone()))
3535
.diagnostic_width(Some(140));
3636
let dcx = DiagCtxt::with_emitter(Box::new(emitter));

‎compiler/rustc_session/src/session.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use rustc_data_structures::sync::{
1818
AtomicU64, DynSend, DynSync, Lock, Lrc, OneThread, Ordering::SeqCst,
1919
};
2020
use rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitterWriter;
21-
use rustc_errors::emitter::{DynEmitter, EmitterWriter, HumanReadableErrorType};
21+
use rustc_errors::emitter::{DynEmitter, HumanEmitter, HumanReadableErrorType};
2222
use rustc_errors::json::JsonEmitter;
2323
use rustc_errors::registry::Registry;
2424
use rustc_errors::{
@@ -1009,7 +1009,7 @@ fn default_emitter(
10091009
);
10101010
Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
10111011
} else {
1012-
let emitter = EmitterWriter::stderr(color_config, fallback_bundle)
1012+
let emitter = HumanEmitter::stderr(color_config, fallback_bundle)
10131013
.fluent_bundle(bundle)
10141014
.sm(Some(source_map))
10151015
.short_message(short)
@@ -1501,7 +1501,7 @@ fn mk_emitter(output: ErrorOutputType) -> Box<DynEmitter> {
15011501
let emitter: Box<DynEmitter> = match output {
15021502
config::ErrorOutputType::HumanReadable(kind) => {
15031503
let (short, color_config) = kind.unzip();
1504-
Box::new(EmitterWriter::stderr(color_config, fallback_bundle).short_message(short))
1504+
Box::new(HumanEmitter::stderr(color_config, fallback_bundle).short_message(short))
15051505
}
15061506
config::ErrorOutputType::Json { pretty, json_rendered } => Box::new(JsonEmitter::basic(
15071507
pretty,

‎src/librustdoc/core.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
22
use rustc_data_structures::sync::Lrc;
33
use rustc_data_structures::unord::UnordSet;
4-
use rustc_errors::emitter::{DynEmitter, EmitterWriter};
4+
use rustc_errors::emitter::{DynEmitter, HumanEmitter};
55
use rustc_errors::json::JsonEmitter;
66
use rustc_errors::TerminalUrl;
77
use rustc_feature::UnstableFeatures;
@@ -138,7 +138,7 @@ pub(crate) fn new_dcx(
138138
ErrorOutputType::HumanReadable(kind) => {
139139
let (short, color_config) = kind.unzip();
140140
Box::new(
141-
EmitterWriter::stderr(color_config, fallback_bundle)
141+
HumanEmitter::stderr(color_config, fallback_bundle)
142142
.sm(source_map.map(|sm| sm as _))
143143
.short_message(short)
144144
.teach(unstable_opts.teach)

‎src/librustdoc/doctest.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ pub(crate) fn make_test(
557557
// crate already is included.
558558
let result = rustc_driver::catch_fatal_errors(|| {
559559
rustc_span::create_session_if_not_set_then(edition, |_| {
560-
use rustc_errors::emitter::{Emitter, EmitterWriter};
560+
use rustc_errors::emitter::{Emitter, HumanEmitter};
561561
use rustc_errors::DiagCtxt;
562562
use rustc_parse::parser::ForceCollect;
563563
use rustc_span::source_map::FilePathMapping;
@@ -572,11 +572,11 @@ pub(crate) fn make_test(
572572
rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
573573
false,
574574
);
575-
supports_color = EmitterWriter::stderr(ColorConfig::Auto, fallback_bundle.clone())
575+
supports_color = HumanEmitter::stderr(ColorConfig::Auto, fallback_bundle.clone())
576576
.diagnostic_width(Some(80))
577577
.supports_color();
578578

579-
let emitter = EmitterWriter::new(Box::new(io::sink()), fallback_bundle);
579+
let emitter = HumanEmitter::new(Box::new(io::sink()), fallback_bundle);
580580

581581
// FIXME(misdreavus): pass `-Z treat-err-as-bug` to the doctest parser
582582
let dcx = DiagCtxt::with_emitter(Box::new(emitter)).disable_warnings();
@@ -739,7 +739,7 @@ fn check_if_attr_is_complete(source: &str, edition: Edition) -> bool {
739739
}
740740
rustc_driver::catch_fatal_errors(|| {
741741
rustc_span::create_session_if_not_set_then(edition, |_| {
742-
use rustc_errors::emitter::EmitterWriter;
742+
use rustc_errors::emitter::HumanEmitter;
743743
use rustc_errors::DiagCtxt;
744744
use rustc_span::source_map::FilePathMapping;
745745

@@ -752,7 +752,7 @@ fn check_if_attr_is_complete(source: &str, edition: Edition) -> bool {
752752
false,
753753
);
754754

755-
let emitter = EmitterWriter::new(Box::new(io::sink()), fallback_bundle);
755+
let emitter = HumanEmitter::new(Box::new(io::sink()), fallback_bundle);
756756

757757
let dcx = DiagCtxt::with_emitter(Box::new(emitter)).disable_warnings();
758758
let sess = ParseSess::with_dcx(dcx, sm);

‎src/tools/clippy/clippy_lints/src/doc/needless_doctest_main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::doc::{NEEDLESS_DOCTEST_MAIN, TEST_ATTR_IN_DOCTEST};
55
use clippy_utils::diagnostics::span_lint;
66
use rustc_ast::{CoroutineKind, Fn, FnRetTy, Item, ItemKind};
77
use rustc_data_structures::sync::Lrc;
8-
use rustc_errors::emitter::EmitterWriter;
8+
use rustc_errors::emitter::HumanEmitter;
99
use rustc_errors::DiagCtxt;
1010
use rustc_lint::LateContext;
1111
use rustc_parse::maybe_new_parser_from_source_str;
@@ -44,7 +44,7 @@ pub fn check(
4444

4545
let fallback_bundle =
4646
rustc_errors::fallback_fluent_bundle(rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(), false);
47-
let emitter = EmitterWriter::new(Box::new(io::sink()), fallback_bundle);
47+
let emitter = HumanEmitter::new(Box::new(io::sink()), fallback_bundle);
4848
let dcx = DiagCtxt::with_emitter(Box::new(emitter)).disable_warnings();
4949
#[expect(clippy::arc_with_non_send_sync)] // `Lrc` is expected by with_dcx
5050
let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));

‎src/tools/rustfmt/src/parse/session.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::path::Path;
22
use std::sync::atomic::{AtomicBool, Ordering};
33

44
use rustc_data_structures::sync::{IntoDynSyncSend, Lrc};
5-
use rustc_errors::emitter::{DynEmitter, Emitter, EmitterWriter};
5+
use rustc_errors::emitter::{DynEmitter, Emitter, HumanEmitter};
66
use rustc_errors::translation::Translate;
77
use rustc_errors::{ColorConfig, DiagCtxt, Diagnostic, Level as DiagnosticLevel};
88
use rustc_session::parse::ParseSess as RawParseSess;
@@ -139,7 +139,7 @@ fn default_dcx(
139139
rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
140140
false,
141141
);
142-
Box::new(EmitterWriter::stderr(emit_color, fallback_bundle).sm(Some(source_map.clone())))
142+
Box::new(HumanEmitter::stderr(emit_color, fallback_bundle).sm(Some(source_map.clone())))
143143
};
144144
DiagCtxt::with_emitter(Box::new(SilentOnIgnoredFilesEmitter {
145145
has_non_ignorable_parser_errors: false,

0 commit comments

Comments
 (0)