Rollup merge of #128806 - estebank:color-config, r=jieyouxu
Split `ColorConfig` off of `HumanReadableErrorType` The previous setup tied two unrelated things together. Splitting these two is a better model. Identified by https://github.com/rust-lang/rust/pull/126597/files#r1667800754
This commit is contained in:
Matthias Krüger
GitHub
commit
f106496b82
9 changed files with 64 additions and 50 deletions
|
|
@ -602,7 +602,7 @@ impl OutputType {
|
|||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum ErrorOutputType {
|
||||
/// Output meant for the consumption of humans.
|
||||
HumanReadable(HumanReadableErrorType),
|
||||
HumanReadable(HumanReadableErrorType, ColorConfig),
|
||||
/// Output that's consumed by other tools such as `rustfix` or the `RLS`.
|
||||
Json {
|
||||
/// Render the JSON in a human readable way (with indents and newlines).
|
||||
|
|
@ -610,12 +610,13 @@ pub enum ErrorOutputType {
|
|||
/// The JSON output includes a `rendered` field that includes the rendered
|
||||
/// human output.
|
||||
json_rendered: HumanReadableErrorType,
|
||||
color_config: ColorConfig,
|
||||
},
|
||||
}
|
||||
|
||||
impl Default for ErrorOutputType {
|
||||
fn default() -> Self {
|
||||
Self::HumanReadable(HumanReadableErrorType::Default(ColorConfig::Auto))
|
||||
Self::HumanReadable(HumanReadableErrorType::Default, ColorConfig::Auto)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1631,6 +1632,7 @@ pub fn parse_color(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> Col
|
|||
/// Possible json config files
|
||||
pub struct JsonConfig {
|
||||
pub json_rendered: HumanReadableErrorType,
|
||||
pub json_color: ColorConfig,
|
||||
json_artifact_notifications: bool,
|
||||
pub json_unused_externs: JsonUnusedExterns,
|
||||
json_future_incompat: bool,
|
||||
|
|
@ -1668,8 +1670,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: fn(ColorConfig) -> HumanReadableErrorType =
|
||||
HumanReadableErrorType::Default;
|
||||
let mut json_rendered = HumanReadableErrorType::Default;
|
||||
let mut json_color = ColorConfig::Never;
|
||||
let mut json_artifact_notifications = false;
|
||||
let mut json_unused_externs = JsonUnusedExterns::No;
|
||||
|
|
@ -1696,7 +1697,8 @@ pub fn parse_json(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> Json
|
|||
}
|
||||
|
||||
JsonConfig {
|
||||
json_rendered: json_rendered(json_color),
|
||||
json_rendered,
|
||||
json_color,
|
||||
json_artifact_notifications,
|
||||
json_unused_externs,
|
||||
json_future_incompat,
|
||||
|
|
@ -1708,6 +1710,7 @@ pub fn parse_error_format(
|
|||
early_dcx: &mut EarlyDiagCtxt,
|
||||
matches: &getopts::Matches,
|
||||
color: ColorConfig,
|
||||
json_color: ColorConfig,
|
||||
json_rendered: HumanReadableErrorType,
|
||||
) -> ErrorOutputType {
|
||||
// We need the `opts_present` check because the driver will send us Matches
|
||||
|
|
@ -1717,18 +1720,22 @@ pub fn parse_error_format(
|
|||
let error_format = if matches.opts_present(&["error-format".to_owned()]) {
|
||||
match matches.opt_str("error-format").as_deref() {
|
||||
None | Some("human") => {
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color))
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::Default, color)
|
||||
}
|
||||
Some("human-annotate-rs") => {
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::AnnotateSnippet(color))
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::AnnotateSnippet, color)
|
||||
}
|
||||
Some("json") => ErrorOutputType::Json { pretty: false, json_rendered },
|
||||
Some("pretty-json") => ErrorOutputType::Json { pretty: true, json_rendered },
|
||||
Some("short") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Short(color)),
|
||||
|
||||
Some("json") => {
|
||||
ErrorOutputType::Json { pretty: false, json_rendered, color_config: json_color }
|
||||
}
|
||||
Some("pretty-json") => {
|
||||
ErrorOutputType::Json { pretty: true, json_rendered, color_config: json_color }
|
||||
}
|
||||
Some("short") => ErrorOutputType::HumanReadable(HumanReadableErrorType::Short, color),
|
||||
Some(arg) => {
|
||||
early_dcx.abort_if_error_and_set_error_format(ErrorOutputType::HumanReadable(
|
||||
HumanReadableErrorType::Default(color),
|
||||
HumanReadableErrorType::Default,
|
||||
color,
|
||||
));
|
||||
early_dcx.early_fatal(format!(
|
||||
"argument for `--error-format` must be `human`, `json` or \
|
||||
|
|
@ -1737,7 +1744,7 @@ pub fn parse_error_format(
|
|||
}
|
||||
}
|
||||
} else {
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color))
|
||||
ErrorOutputType::HumanReadable(HumanReadableErrorType::Default, color)
|
||||
};
|
||||
|
||||
match error_format {
|
||||
|
|
@ -1791,7 +1798,7 @@ fn check_error_format_stability(
|
|||
if let ErrorOutputType::Json { pretty: true, .. } = error_format {
|
||||
early_dcx.early_fatal("`--error-format=pretty-json` is unstable");
|
||||
}
|
||||
if let ErrorOutputType::HumanReadable(HumanReadableErrorType::AnnotateSnippet(_)) =
|
||||
if let ErrorOutputType::HumanReadable(HumanReadableErrorType::AnnotateSnippet, _) =
|
||||
error_format
|
||||
{
|
||||
early_dcx.early_fatal("`--error-format=human-annotate-rs` is unstable");
|
||||
|
|
@ -2392,12 +2399,13 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
|
|||
|
||||
let JsonConfig {
|
||||
json_rendered,
|
||||
json_color,
|
||||
json_artifact_notifications,
|
||||
json_unused_externs,
|
||||
json_future_incompat,
|
||||
} = parse_json(early_dcx, matches);
|
||||
|
||||
let error_format = parse_error_format(early_dcx, matches, color, json_rendered);
|
||||
let error_format = parse_error_format(early_dcx, matches, color, json_color, json_rendered);
|
||||
|
||||
early_dcx.abort_if_error_and_set_error_format(error_format);
|
||||
|
||||
|
|
|
|||
|
|
@ -950,10 +950,10 @@ fn default_emitter(
|
|||
t => t,
|
||||
};
|
||||
match sopts.error_format {
|
||||
config::ErrorOutputType::HumanReadable(kind) => {
|
||||
let (short, color_config) = kind.unzip();
|
||||
config::ErrorOutputType::HumanReadable(kind, color_config) => {
|
||||
let short = kind.short();
|
||||
|
||||
if let HumanReadableErrorType::AnnotateSnippet(_) = kind {
|
||||
if let HumanReadableErrorType::AnnotateSnippet = kind {
|
||||
let emitter = AnnotateSnippetEmitter::new(
|
||||
Some(source_map),
|
||||
bundle,
|
||||
|
|
@ -978,13 +978,14 @@ fn default_emitter(
|
|||
Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
|
||||
}
|
||||
}
|
||||
config::ErrorOutputType::Json { pretty, json_rendered } => Box::new(
|
||||
config::ErrorOutputType::Json { pretty, json_rendered, color_config } => Box::new(
|
||||
JsonEmitter::new(
|
||||
Box::new(io::BufWriter::new(io::stderr())),
|
||||
source_map,
|
||||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
color_config,
|
||||
)
|
||||
.registry(Some(registry))
|
||||
.fluent_bundle(bundle)
|
||||
|
|
@ -1425,20 +1426,23 @@ fn mk_emitter(output: ErrorOutputType) -> Box<DynEmitter> {
|
|||
let fallback_bundle =
|
||||
fallback_fluent_bundle(vec![rustc_errors::DEFAULT_LOCALE_RESOURCE], false);
|
||||
let emitter: Box<DynEmitter> = match output {
|
||||
config::ErrorOutputType::HumanReadable(kind) => {
|
||||
let (short, color_config) = kind.unzip();
|
||||
config::ErrorOutputType::HumanReadable(kind, color_config) => {
|
||||
let short = kind.short();
|
||||
Box::new(
|
||||
HumanEmitter::new(stderr_destination(color_config), fallback_bundle)
|
||||
.short_message(short),
|
||||
)
|
||||
}
|
||||
config::ErrorOutputType::Json { pretty, json_rendered } => Box::new(JsonEmitter::new(
|
||||
Box::new(io::BufWriter::new(io::stderr())),
|
||||
Lrc::new(SourceMap::new(FilePathMapping::empty())),
|
||||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
)),
|
||||
config::ErrorOutputType::Json { pretty, json_rendered, color_config } => {
|
||||
Box::new(JsonEmitter::new(
|
||||
Box::new(io::BufWriter::new(io::stderr())),
|
||||
Lrc::new(SourceMap::new(FilePathMapping::empty())),
|
||||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
color_config,
|
||||
))
|
||||
}
|
||||
};
|
||||
emitter
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue