Auto merge of #150645 - GuillaumeGomez:rename-rustdoc-tests, r=Kobzol,Zalathar

Rename `tests/rustdoc` into `tests/rustdoc-html`

As discussed on [zulip](https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc/topic/rename.20tests.2Frustdoc.20to.20rustdoc-html.3F/with/566142388), renaming this testsuite better reflects what they actually test. Later on, it could also allow us to add an alias to run all rustdoc tests at once.

r? @camelid

Author: rust-bors[bot]

rustfmt.toml

@@ -21,7 +21,7 @@ ignore = [
     "/tests/pretty/",                 # These tests are very sensitive to source code layout.
     "/tests/run-make/export",         # These tests contain syntax errors.
     "/tests/run-make/translation/test.rs", # This test contains syntax errors.
-    "/tests/rustdoc/",                # Some have syntax errors, some are whitespace-sensitive.
+    "/tests/rustdoc-html/",           # Some have syntax errors, some are whitespace-sensitive.
     "/tests/rustdoc-gui/",            # Some tests are sensitive to source code layout.
     "/tests/rustdoc-ui/",             # Some have syntax errors, some are whitespace-sensitive.
     "/tests/ui/",                     # Some have syntax errors, some are whitespace-sensitive.

src/bootstrap/src/core/build_steps/test.rs

@@ -1582,10 +1582,10 @@ test!(UiFullDeps {
     IS_HOST: true,
 });
 
-test!(Rustdoc {
-    path: "tests/rustdoc",
-    mode: CompiletestMode::Rustdoc,
-    suite: "rustdoc",
+test!(RustdocHtml {
+    path: "tests/rustdoc-html",
+    mode: CompiletestMode::RustdocHtml,
+    suite: "rustdoc-html",
     default: true,
     IS_HOST: true,
 });
@@ -1969,7 +1969,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
         if matches!(
             mode,
             CompiletestMode::RunMake
-                | CompiletestMode::Rustdoc
+                | CompiletestMode::RustdocHtml
                 | CompiletestMode::RustdocJs
                 | CompiletestMode::RustdocJson
         ) || matches!(suite, "rustdoc-ui" | "coverage-run-rustdoc")
@@ -2758,7 +2758,7 @@ impl Step for ErrorIndex {
     fn make_run(run: RunConfig<'_>) {
         // error_index_generator depends on librustdoc. Use the compiler that
         // is normally used to build rustdoc for other tests (like compiletest
-        // tests in tests/rustdoc) so that it shares the same artifacts.
+        // tests in tests/rustdoc-html) so that it shares the same artifacts.
         let compilers = RustcPrivateCompilers::new(
             run.builder,
             run.builder.top_stage,
@@ -3159,7 +3159,7 @@ impl Step for CrateRustdoc {
             builder.compiler(builder.top_stage, target)
         } else {
             // Use the previous stage compiler to reuse the artifacts that are
-            // created when running compiletest for tests/rustdoc. If this used
+            // created when running compiletest for tests/rustdoc-html. If this used
             // `compiler`, then it would cause rustdoc to be built *again*, which
             // isn't really necessary.
             builder.compiler_for(builder.top_stage, target, target)

src/bootstrap/src/core/build_steps/test/compiletest.rs

@@ -21,7 +21,7 @@ pub(crate) enum CompiletestMode {
     MirOpt,
     Pretty,
     RunMake,
-    Rustdoc,
+    RustdocHtml,
     RustdocJs,
     RustdocJson,
     Ui,
@@ -49,7 +49,7 @@ impl CompiletestMode {
             Self::MirOpt => "mir-opt",
             Self::Pretty => "pretty",
             Self::RunMake => "run-make",
-            Self::Rustdoc => "rustdoc",
+            Self::RustdocHtml => "rustdoc-html",
             Self::RustdocJs => "rustdoc-js",
             Self::RustdocJson => "rustdoc-json",
             Self::Ui => "ui",

src/bootstrap/src/core/builder/cli_paths.rs

@@ -31,8 +31,8 @@ pub(crate) const PATH_REMAP: &[(&str, &[&str])] = &[
             "tests/pretty",
             "tests/run-make",
             "tests/run-make-cargo",
-            "tests/rustdoc",
             "tests/rustdoc-gui",
+            "tests/rustdoc-html",
             "tests/rustdoc-js",
             "tests/rustdoc-js-std",
             "tests/rustdoc-json",

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap

@@ -1,6 +1,5 @@
 ---
 source: src/bootstrap/src/core/builder/cli_paths/tests.rs
-assertion_line: 68
 expression: test
 ---
 [Test] test::Tidy
@@ -38,9 +37,9 @@ expression: test
 [Test] test::UiFullDeps
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/ui-fulldeps)
-[Test] test::Rustdoc
+[Test] test::RustdocHtml
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::CoverageRunRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/coverage-run-rustdoc)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_librustdoc_rustdoc.snap

@@ -5,9 +5,6 @@ expression: test librustdoc rustdoc
 [Test] test::CrateRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/librustdoc, test::src/tools/rustdoc})
-[Test] test::Rustdoc
-    targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
 [Test] test::RustdocBook
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/doc/rustdoc})

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_librustdoc_rustdoc_html.snap

@@ -0,0 +1,10 @@
+---
+source: src/bootstrap/src/core/builder/cli_paths/tests.rs
+expression: test librustdoc rustdoc-html
+---
+[Test] test::CrateRustdoc
+    targets: [x86_64-unknown-linux-gnu]
+    - Set({test::src/librustdoc})
+[Test] test::RustdocHtml
+    targets: [x86_64-unknown-linux-gnu]
+    - Suite(test::tests/rustdoc-html)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_rustdoc.snap

@@ -2,9 +2,6 @@
 source: src/bootstrap/src/core/builder/cli_paths/tests.rs
 expression: test rustdoc
 ---
-[Test] test::Rustdoc
-    targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
 [Test] test::CrateRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/tools/rustdoc})

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_rustdoc_html.snap

@@ -0,0 +1,7 @@
+---
+source: src/bootstrap/src/core/builder/cli_paths/tests.rs
+expression: test rustdoc-html
+---
+[Test] test::RustdocHtml
+    targets: [x86_64-unknown-linux-gnu]
+    - Suite(test::tests/rustdoc-html)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap

@@ -1,6 +1,5 @@
 ---
 source: src/bootstrap/src/core/builder/cli_paths/tests.rs
-assertion_line: 68
 expression: test --skip=coverage
 ---
 [Test] test::Tidy
@@ -37,9 +36,9 @@ expression: test --skip=coverage
 [Test] test::UiFullDeps
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/ui-fulldeps)
-[Test] test::Rustdoc
+[Test] test::RustdocHtml
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::CoverageRunRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/coverage-run-rustdoc)