about summary refs log tree commit diff
diff options
context:
space:
mode:
authorjyn <jyn.nelson@redjack.com>2023-05-24 10:42:18 -0500
committerjyn <jyn.nelson@redjack.com>2023-05-24 11:18:20 -0500
commit9314ed0cbd1cda2df6c14b7d657db9aceb1b39a5 (patch)
tree563d7071096a759a490094d00c8fffd7c43bb2e8
parent70db8369226c4d2386b25d66a49c8989247934bf (diff)
downloadrust-9314ed0cbd1cda2df6c14b7d657db9aceb1b39a5.tar.gz
rust-9314ed0cbd1cda2df6c14b7d657db9aceb1b39a5.zip
libtest: Improve error when missing `-Zunstable-options`
"only accepted on the nightly compiler" is misleading when this *is* nightly.
-rw-r--r--library/test/src/cli.rs4
-rw-r--r--tests/ui/test-attrs/tests-listing-format-json-without-unstableopts.run.stderr2
2 files changed, 3 insertions, 3 deletions
diff --git a/library/test/src/cli.rs b/library/test/src/cli.rs
index 9d22ebbee87..6ac3b3eaa79 100644
--- 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
index 9f6276300a0..5d8b3755441 100644
--- 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