Auto merge of #11358 - hi-rustin:rustin-patch-error-msg, r=weihanglo

bors · bors · commit c8b090c3d493 · 2022-11-10T08:52:44.000Z
Extract `two_kinds_of_msg_format_err` message to de-duplicate it

### What does this PR try to resolve?

Extract `two_kinds_of_msg_format_err` message to de-duplicate it.

I guess this would be helpful for changing this message.

### Additional information

Just found it when I read the code. So if you prefer the former code style, please feel free to close my PR.
diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
@@ -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);
                     }
@@ -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" => {
@@ -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" => {
@@ -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),

Original file line number	Diff line number	Diff line change
`@@ -469,25 +469,26 @@ pub trait ArgMatchesExt {`
`469`	`469`	`ansi: false,`
`470`	`470`	`render_diagnostics: false,`
`471`	`471`	`};`
	`472`	+ let two_kinds_of_msg_format_err = "cannot specify two kinds of `message-format` arguments";
`472`	`473`	`for fmt in self._values_of("message-format") {`
`473`	`474`	`for fmt in fmt.split(',') {`
`474`	`475`	`let fmt = fmt.to_ascii_lowercase();`
`475`	`476`	`match fmt.as_str() {`
`476`	`477`	`"json" => {`
`477`	`478`	`if message_format.is_some() {`
`478`		- bail!("cannot specify two kinds of `message-format` arguments");
	`479`	`+ bail!(two_kinds_of_msg_format_err);`
`479`	`480`	`}`
`480`	`481`	`message_format = Some(default_json);`
`481`	`482`	`}`
`482`	`483`	`"human" => {`
`483`	`484`	`if message_format.is_some() {`
`484`		- bail!("cannot specify two kinds of `message-format` arguments");
	`485`	`+ bail!(two_kinds_of_msg_format_err);`
`485`	`486`	`}`
`486`	`487`	`message_format = Some(MessageFormat::Human);`
`487`	`488`	`}`
`488`	`489`	`"short" => {`
`489`	`490`	`if message_format.is_some() {`
`490`		- bail!("cannot specify two kinds of `message-format` arguments");
	`491`	`+ bail!(two_kinds_of_msg_format_err);`
`491`	`492`	`}`
`492`	`493`	`message_format = Some(MessageFormat::Short);`
`493`	`494`	`}`
`@@ -499,7 +500,7 @@ pub trait ArgMatchesExt {`
`499`	`500`	`Some(MessageFormat::Json {`
`500`	`501`	`render_diagnostics, ..`
`501`	`502`	`}) => *render_diagnostics = true,`
`502`		- _ => bail!("cannot specify two kinds of `message-format` arguments"),
	`503`	`+ _ => bail!(two_kinds_of_msg_format_err),`
`503`	`504`	`}`
`504`	`505`	`}`
`505`	`506`	`"json-diagnostic-short" => {`
`@@ -508,7 +509,7 @@ pub trait ArgMatchesExt {`
`508`	`509`	`}`
`509`	`510`	`match &mut message_format {`
`510`	`511`	`Some(MessageFormat::Json { short, .. }) => *short = true,`
`511`		- _ => bail!("cannot specify two kinds of `message-format` arguments"),
	`512`	`+ _ => bail!(two_kinds_of_msg_format_err),`
`512`	`513`	`}`
`513`	`514`	`}`
`514`	`515`	`"json-diagnostic-rendered-ansi" => {`
`@@ -517,7 +518,7 @@ pub trait ArgMatchesExt {`
`517`	`518`	`}`
`518`	`519`	`match &mut message_format {`
`519`	`520`	`Some(MessageFormat::Json { ansi, .. }) => *ansi = true,`
`520`		- _ => bail!("cannot specify two kinds of `message-format` arguments"),
	`521`	`+ _ => bail!(two_kinds_of_msg_format_err),`
`521`	`522`	`}`
`522`	`523`	`}`
`523`	`524`	s => bail!("invalid message format specifier: `{}`", s),