Rollup merge of #111915 - jyn514:libtest-errors, r=thomcc
libtest: Improve error when missing `-Zunstable-options` "only accepted on the nightly compiler" is misleading when this *is* nightly.
This commit is contained in:
commit
8038606bf3
@ -404,13 +404,13 @@ fn get_format(
|
||||
Some("terse") => OutputFormat::Terse,
|
||||
Some("json") => {
|
||||
if !allow_unstable {
|
||||
return Err("The \"json\" format is only accepted on the nightly compiler".into());
|
||||
return Err("The \"json\" format is only accepted on the nightly compiler with -Z unstable-options".into());
|
||||
}
|
||||
OutputFormat::Json
|
||||
}
|
||||
Some("junit") => {
|
||||
if !allow_unstable {
|
||||
return Err("The \"junit\" format is only accepted on the nightly compiler".into());
|
||||
return Err("The \"junit\" format is only accepted on the nightly compiler with -Z unstable-options".into());
|
||||
}
|
||||
OutputFormat::Junit
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
error: The "json" format is only accepted on the nightly compiler
|
||||
error: The "json" format is only accepted on the nightly compiler with -Z unstable-options
|
||||
|
Loading…
x
Reference in New Issue
Block a user