From 0401a9935fd532a67b4f825684a57f43af8a4f65 Mon Sep 17 00:00:00 2001
From: Tristan Dannenberg <dtristan@hotmail.de>
Date: Tue, 12 Jan 2021 17:29:47 +0100
Subject: [PATCH] Update help message and add regression test

---
 src/librustdoc/lib.rs           | 7 +------
 src/test/rustdoc/issue-80893.rs | 7 +++++++
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 src/test/rustdoc/issue-80893.rs

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 5a324fb1e567..efcb006870c5 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -412,12 +412,7 @@ fn opts() -> Vec<RustcOptGroup> {
             )
         }),
         unstable("test-builder", |o| {
-            o.optopt(
-                "",
-                "test-builder",
-                "specifies the rustc-like binary to use as the test builder",
-                "PATH",
-            )
+            o.optopt("", "test-builder", "The rustc-like binary to use as the test builder", "PATH")
         }),
         unstable("check", |o| o.optflag("", "check", "Run rustdoc checks")),
     ]
diff --git a/src/test/rustdoc/issue-80893.rs b/src/test/rustdoc/issue-80893.rs
new file mode 100644
index 000000000000..26f9a56b50ee
--- /dev/null
+++ b/src/test/rustdoc/issue-80893.rs
@@ -0,0 +1,7 @@
+// compile-flags: --test -Z unstable-options --test-builder true --runtool true
+
+/// ```
+/// This does not compile, but specifying a custom --test-builder should let this pass anyway
+/// `true` does not generate an output file to run, so we also specify it as a runtool
+/// ```
+pub struct Foo;