refactor: Make short a field on HumanReadableErrorType varinants

Author: Muscraft

compiler/rustc_errors/src/emitter.rs

@@ -47,14 +47,16 @@ const DEFAULT_COLUMN_WIDTH: usize = 140;
 /// Describes the way the content of the `rendered` field of the json output is generated
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum HumanReadableErrorType {
- Default,
- AnnotateSnippet { unicode: bool },
- Short,
+ Default { short: bool },
+ AnnotateSnippet { short: bool, unicode: bool },
 }
 
 impl HumanReadableErrorType {
  pub fn short(&self) -> bool {
- *self == HumanReadableErrorType::Short
+ match self {
+ HumanReadableErrorType::Default { short }
+ | HumanReadableErrorType::AnnotateSnippet { short, .. } => *short,
+ }
  }
 }
 

compiler/rustc_errors/src/json.rs

@@ -371,42 +371,44 @@ impl Diagnostic {
  .insert(0, Diagnostic::from_sub_diagnostic(&diag.emitted_at_sub_diag(), &args, je));
  }
  let buf = BufWriter(Arc::new(Mutex::new(Vec::new())));
- let short = je.json_rendered.short();
  let dst: Destination = AutoStream::new(
  Box::new(buf.clone()),
  match je.color_config.to_color_choice() {
  ColorChoice::Auto => ColorChoice::Always,
  choice => choice,
  },
  );
- if let HumanReadableErrorType::AnnotateSnippet { unicode } = je.json_rendered {
- AnnotateSnippetEmitter::new(dst, je.translator.clone())
- .short_message(short)
- .sm(je.sm.clone())
- .diagnostic_width(je.diagnostic_width)
- .macro_backtrace(je.macro_backtrace)
- .track_diagnostics(je.track_diagnostics)
- .terminal_url(je.terminal_url)
- .ui_testing(je.ui_testing)
- .ignored_directories_in_source_blocks(
- je.ignored_directories_in_source_blocks.clone(),
- )
- .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
- .emit_diagnostic(diag, registry)
- } else {
- HumanEmitter::new(dst, je.translator.clone())
- .short_message(short)
- .sm(je.sm.clone())
- .diagnostic_width(je.diagnostic_width)
- .macro_backtrace(je.macro_backtrace)
- .track_diagnostics(je.track_diagnostics)
- .terminal_url(je.terminal_url)
- .ui_testing(je.ui_testing)
- .ignored_directories_in_source_blocks(
- je.ignored_directories_in_source_blocks.clone(),
- )
- .theme(OutputTheme::Ascii)
- .emit_diagnostic(diag, registry)
+ match je.json_rendered {
+ HumanReadableErrorType::AnnotateSnippet { short, unicode } => {
+ AnnotateSnippetEmitter::new(dst, je.translator.clone())
+ .short_message(short)
+ .sm(je.sm.clone())
+ .diagnostic_width(je.diagnostic_width)
+ .macro_backtrace(je.macro_backtrace)
+ .track_diagnostics(je.track_diagnostics)
+ .terminal_url(je.terminal_url)
+ .ui_testing(je.ui_testing)
+ .ignored_directories_in_source_blocks(
+ je.ignored_directories_in_source_blocks.clone(),
+ )
+ .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
+ .emit_diagnostic(diag, registry)
+ }
+ HumanReadableErrorType::Default { short } => {
+ HumanEmitter::new(dst, je.translator.clone())
+ .short_message(short)
+ .sm(je.sm.clone())
+ .diagnostic_width(je.diagnostic_width)
+ .macro_backtrace(je.macro_backtrace)
+ .track_diagnostics(je.track_diagnostics)
+ .terminal_url(je.terminal_url)
+ .ui_testing(je.ui_testing)
+ .ignored_directories_in_source_blocks(
+ je.ignored_directories_in_source_blocks.clone(),
+ )
+ .theme(OutputTheme::Ascii)
+ .emit_diagnostic(diag, registry)
+ }
  }
 
  let buf = Arc::try_unwrap(buf.0).unwrap().into_inner().unwrap();

compiler/rustc_interface/src/tests.rs

@@ -321,7 +321,7 @@ fn test_search_paths_tracking_hash_different_order() {
  let early_dcx = EarlyDiagCtxt::new(JSON);
  const JSON: ErrorOutputType = ErrorOutputType::Json {
  pretty: false,
- json_rendered: HumanReadableErrorType::Default,
+ json_rendered: HumanReadableErrorType::Default { short: false },
  color_config: ColorConfig::Never,
  };
 

compiler/rustc_session/src/config.rs

@@ -837,7 +837,7 @@ pub enum ErrorOutputType {
  /// Output meant for the consumption of humans.
  #[default]
  HumanReadable {
- kind: HumanReadableErrorType = HumanReadableErrorType::Default,
+ kind: HumanReadableErrorType = HumanReadableErrorType::Default { short: false },
  color_config: ColorConfig = ColorConfig::Auto,
  },
  /// Output that's consumed by other tools such as `rustfix` or the `RLS`.
@@ -2051,7 +2051,7 @@ impl JsonUnusedExterns {
 /// The first value returned is how to render JSON diagnostics, and the second
 /// is whether or not artifact notifications are enabled.
 pub fn parse_json(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> JsonConfig {
- let mut json_rendered = HumanReadableErrorType::Default;
+ let mut json_rendered = HumanReadableErrorType::Default { short: false };
  let mut json_color = ColorConfig::Never;
  let mut json_artifact_notifications = false;
  let mut json_unused_externs = JsonUnusedExterns::No;
@@ -2067,9 +2067,12 @@ pub fn parse_json(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> Json
 
  for sub_option in option.split(',') {
  match sub_option {
- "diagnostic-short" => json_rendered = HumanReadableErrorType::Short,
+ "diagnostic-short" => {
+ json_rendered = HumanReadableErrorType::Default { short: true }
+ }
  "diagnostic-unicode" => {
- json_rendered = HumanReadableErrorType::AnnotateSnippet { unicode: true };
+ json_rendered =
+ HumanReadableErrorType::AnnotateSnippet { short: false, unicode: true };
  }
  "diagnostic-rendered-ansi" => json_color = ColorConfig::Always,
  "artifacts" => json_artifact_notifications = true,
@@ -2108,7 +2111,7 @@ pub fn parse_error_format(
  match matches.opt_str("error-format").as_deref() {
  None | Some("human") => ErrorOutputType::HumanReadable { color_config, .. },
  Some("human-annotate-rs") => ErrorOutputType::HumanReadable {
- kind: HumanReadableErrorType::AnnotateSnippet { unicode: false },
+ kind: HumanReadableErrorType::AnnotateSnippet { short: false, unicode: false },
  color_config,
  },
  Some("json") => {
@@ -2117,11 +2120,12 @@ pub fn parse_error_format(
  Some("pretty-json") => {
  ErrorOutputType::Json { pretty: true, json_rendered, color_config: json_color }
  }
- Some("short") => {
- ErrorOutputType::HumanReadable { kind: HumanReadableErrorType::Short, color_config }
- }
+ Some("short") => ErrorOutputType::HumanReadable {
+ kind: HumanReadableErrorType::Default { short: true },
+ color_config,
+ },
  Some("human-unicode") => ErrorOutputType::HumanReadable {
- kind: HumanReadableErrorType::AnnotateSnippet { unicode: true },
+ kind: HumanReadableErrorType::AnnotateSnippet { short: false, unicode: true },
  color_config,
  },
  Some(arg) => {
@@ -2189,8 +2193,8 @@ fn check_error_format_stability(
  let format = match format {
  ErrorOutputType::Json { pretty: true, .. } => "pretty-json",
  ErrorOutputType::HumanReadable { kind, .. } => match kind {
- HumanReadableErrorType::AnnotateSnippet { unicode: false } => "human-annotate-rs",
- HumanReadableErrorType::AnnotateSnippet { unicode: true } => "human-unicode",
+ HumanReadableErrorType::AnnotateSnippet { unicode: false, .. } => "human-annotate-rs",
+ HumanReadableErrorType::AnnotateSnippet { unicode: true, .. } => "human-unicode",
  _ => return,
  },
  _ => return,

compiler/rustc_session/src/session.rs

@@ -950,9 +950,8 @@ fn default_emitter(
  let source_map = if sopts.unstable_opts.link_only { None } else { Some(source_map) };
 
  match sopts.error_format {
- config::ErrorOutputType::HumanReadable { kind, color_config } => {
- let short = kind.short();
- if let HumanReadableErrorType::AnnotateSnippet { unicode } = kind {
+ config::ErrorOutputType::HumanReadable { kind, color_config } => match kind {
+ HumanReadableErrorType::AnnotateSnippet { short, unicode } => {
  let emitter =
  AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
  .sm(source_map)
@@ -969,7 +968,8 @@ fn default_emitter(
  .clone(),
  );
  Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
- } else {
+ }
+ HumanReadableErrorType::Default { short } => {
  let emitter = HumanEmitter::new(stderr_destination(color_config), translator)
  .sm(source_map)
  .short_message(short)
@@ -983,7 +983,7 @@ fn default_emitter(
  );
  Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
  }
- }
+ },
  config::ErrorOutputType::Json { pretty, json_rendered, color_config } => Box::new(
  JsonEmitter::new(
  Box::new(io::BufWriter::new(io::stderr())),
@@ -1490,22 +1490,18 @@ fn mk_emitter(output: ErrorOutputType) -> Box<DynEmitter> {
  let translator =
  Translator::with_fallback_bundle(vec![rustc_errors::DEFAULT_LOCALE_RESOURCE], false);
  let emitter: Box<DynEmitter> = match output {
- config::ErrorOutputType::HumanReadable { kind, color_config } => {
- let short = kind.short();
- if let HumanReadableErrorType::AnnotateSnippet { unicode } = kind {
- Box::new(
- AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
- .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
- .short_message(short),
- )
- } else {
- Box::new(
- HumanEmitter::new(stderr_destination(color_config), translator)
- .theme(OutputTheme::Ascii)
- .short_message(short),
- )
- }
- }
+ config::ErrorOutputType::HumanReadable { kind, color_config } => match kind {
+ HumanReadableErrorType::AnnotateSnippet { short, unicode } => Box::new(
+ AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
+ .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
+ .short_message(short),
+ ),
+ HumanReadableErrorType::Default { short } => Box::new(
+ HumanEmitter::new(stderr_destination(color_config), translator)
+ .theme(OutputTheme::Ascii)
+ .short_message(short),
+ ),
+ },
  config::ErrorOutputType::Json { pretty, json_rendered, color_config } => {
  Box::new(JsonEmitter::new(
  Box::new(io::BufWriter::new(io::stderr())),

src/librustdoc/core.rs

@@ -153,30 +153,26 @@ pub(crate) fn new_dcx(
 ) -> rustc_errors::DiagCtxt {
  let translator = rustc_driver::default_translator();
  let emitter: Box<DynEmitter> = match error_format {
- ErrorOutputType::HumanReadable { kind, color_config } => {
- let short = kind.short();
- if let HumanReadableErrorType::AnnotateSnippet { unicode } = kind {
- Box::new(
- AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
- .sm(source_map.map(|sm| sm as _))
- .short_message(short)
- .diagnostic_width(diagnostic_width)
- .track_diagnostics(unstable_opts.track_diagnostics)
- .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
- .ui_testing(unstable_opts.ui_testing),
- )
- } else {
- Box::new(
- HumanEmitter::new(stderr_destination(color_config), translator)
- .sm(source_map.map(|sm| sm as _))
- .short_message(short)
- .diagnostic_width(diagnostic_width)
- .track_diagnostics(unstable_opts.track_diagnostics)
- .theme(OutputTheme::Ascii)
- .ui_testing(unstable_opts.ui_testing),
- )
- }
- }
+ ErrorOutputType::HumanReadable { kind, color_config } => match kind {
+ HumanReadableErrorType::AnnotateSnippet { short, unicode } => Box::new(
+ AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
+ .sm(source_map.map(|sm| sm as _))
+ .short_message(short)
+ .diagnostic_width(diagnostic_width)
+ .track_diagnostics(unstable_opts.track_diagnostics)
+ .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
+ .ui_testing(unstable_opts.ui_testing),
+ ),
+ HumanReadableErrorType::Default { short } => Box::new(
+ HumanEmitter::new(stderr_destination(color_config), translator)
+ .sm(source_map.map(|sm| sm as _))
+ .short_message(short)
+ .diagnostic_width(diagnostic_width)
+ .track_diagnostics(unstable_opts.track_diagnostics)
+ .theme(OutputTheme::Ascii)
+ .ui_testing(unstable_opts.ui_testing),
+ ),
+ },
  ErrorOutputType::Json { pretty, json_rendered, color_config } => {
  let source_map = source_map.unwrap_or_else(|| {
  Arc::new(source_map::SourceMap::new(source_map::FilePathMapping::empty()))

src/librustdoc/doctest.rs

@@ -599,7 +599,7 @@ fn run_test(
  ]);
  if let ErrorOutputType::HumanReadable { kind, color_config } = rustdoc_options.error_format {
  let short = kind.short();
- let unicode = kind == HumanReadableErrorType::AnnotateSnippet { unicode: true };
+ let unicode = kind == HumanReadableErrorType::AnnotateSnippet { unicode: true, short };
 
  if short {
  compiler_args.extend_from_slice(&["--error-format".to_owned(), "short".to_owned()]);