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.
rust-lang · May 24, 2023 · 8038606 · 8038606
2 parents d0b3ebe + 9314ed0
commit 8038606
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/test/src/cli.rs b/library/test/src/cli.rs
@@ -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
         }

diff --git a/tests/ui/test-attrs/tests-listing-format-json-without-unstableopts.run.stderr b/tests/ui/test-attrs/tests-listing-format-json-without-unstableopts.run.stderr
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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