Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract two_kinds_of_msg_format_err message to de-duplicate it #11358

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Extract two_kinds_of_msg_format_err message to de-duplicate it #11358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/cargo/util/command_prelude.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,25 +469,26 @@ pub trait ArgMatchesExt {
ansi: false,
render_diagnostics: false,
};
let two_kinds_of_msg_format_err = "cannot specify two kinds of `message-format` arguments";
for fmt in self._values_of("message-format") {
for fmt in fmt.split(',') {
let fmt = fmt.to_ascii_lowercase();
match fmt.as_str() {
"json" => {
if message_format.is_some() {
bail!("cannot specify two kinds of `message-format` arguments");
bail!(two_kinds_of_msg_format_err);
}
message_format = Some(default_json);
}
"human" => {
if message_format.is_some() {
bail!("cannot specify two kinds of `message-format` arguments");
bail!(two_kinds_of_msg_format_err);
}
message_format = Some(MessageFormat::Human);
}
"short" => {
if message_format.is_some() {
bail!("cannot specify two kinds of `message-format` arguments");
bail!(two_kinds_of_msg_format_err);
}
message_format = Some(MessageFormat::Short);
}
Expand All @@ -499,7 +500,7 @@ pub trait ArgMatchesExt {
Some(MessageFormat::Json {
render_diagnostics, ..
}) => *render_diagnostics = true,
_ => bail!("cannot specify two kinds of `message-format` arguments"),
_ => bail!(two_kinds_of_msg_format_err),
}
}
"json-diagnostic-short" => {
Expand All @@ -508,7 +509,7 @@ pub trait ArgMatchesExt {
}
match &mut message_format {
Some(MessageFormat::Json { short, .. }) => *short = true,
_ => bail!("cannot specify two kinds of `message-format` arguments"),
_ => bail!(two_kinds_of_msg_format_err),
}
}
"json-diagnostic-rendered-ansi" => {
Expand All @@ -517,7 +518,7 @@ pub trait ArgMatchesExt {
}
match &mut message_format {
Some(MessageFormat::Json { ansi, .. }) => *ansi = true,
_ => bail!("cannot specify two kinds of `message-format` arguments"),
_ => bail!(two_kinds_of_msg_format_err),
}
}
s => bail!("invalid message format specifier: `{}`", s),
Expand Down