From 39b495c3ff607cf8826f2d8800f1b9d774292977 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sat, 25 Nov 2023 10:34:27 -0500
Subject: [PATCH 1/3] bootstrap: build `rustfix` doc from `src/tools/cargo`

---
 src/bootstrap/src/core/build_steps/doc.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index 834f88dc891e8..c90a1b897591f 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -1002,6 +1002,7 @@ tool_doc!(
         "cargo-test-macro",
         "cargo-test-support",
         "cargo-credential",
+        "rustfix",
         "mdman",
         // FIXME: this trips a license check in tidy.
         // "resolver-tests",

From ee9a70dec066b5e40392eeb21b0a7b3282127ed0 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sat, 25 Nov 2023 10:34:58 -0500
Subject: [PATCH 2/3] bootstrap: sort items of cargo docs

---
 src/bootstrap/src/core/build_steps/doc.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index c90a1b897591f..acddd4d77fa4e 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -996,14 +996,14 @@ tool_doc!(
     in_tree = false,
     crates = [
         "cargo",
+        "cargo-credential",
         "cargo-platform",
-        "cargo-util",
-        "crates-io",
         "cargo-test-macro",
         "cargo-test-support",
-        "cargo-credential",
-        "rustfix",
+        "cargo-util",
+        "crates-io",
         "mdman",
+        "rustfix",
         // FIXME: this trips a license check in tidy.
         // "resolver-tests",
     ]

From 72321011cab6d3bb338e5776bb3bf293c7699f42 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Sat, 25 Nov 2023 10:35:43 -0500
Subject: [PATCH 3/3] bootstrap: remove unused comment

resolver-tests is for test only so no need to document it.
---
 src/bootstrap/src/core/build_steps/doc.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index acddd4d77fa4e..cf3f5bc983ef0 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -1004,8 +1004,6 @@ tool_doc!(
         "crates-io",
         "mdman",
         "rustfix",
-        // FIXME: this trips a license check in tidy.
-        // "resolver-tests",
     ]
 );
 tool_doc!(Tidy, "tidy", "src/tools/tidy", rustc_tool = false, crates = ["tidy"]);