diff --git a/.gitmodules b/.gitmodules index 40e6fc2c19db0..3252894e72bd6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,6 @@ [submodule "library/stdarch"] path = library/stdarch url = https://github.com/rust-lang/stdarch.git -[submodule "src/doc/rustc-dev-guide"] - path = src/doc/rustc-dev-guide - url = https://github.com/rust-lang/rustc-dev-guide.git [submodule "src/doc/edition-guide"] path = src/doc/edition-guide url = https://github.com/rust-lang/edition-guide.git diff --git a/rustfmt.toml b/rustfmt.toml index af807aa6f739e..f16f32d9f6337 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -23,7 +23,6 @@ ignore = [ "src/doc/nomicon", "src/doc/reference", "src/doc/rust-by-example", - "src/doc/rustc-dev-guide", "src/llvm-project", "src/tools/cargo", "src/tools/clippy", diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index f1a160250dbe1..e71a1f1d3eaab 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -413,7 +413,6 @@ impl<'a> Builder<'a> { test::UnstableBook, test::RustcBook, test::LintDocs, - test::RustcGuide, test::EmbeddedBook, test::EditionGuide, test::Rustfmt, diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index d9132f20d85b3..bf52036b89a08 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1536,34 +1536,6 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) -> } } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] -pub struct RustcGuide; - -impl Step for RustcGuide { - type Output = (); - const DEFAULT: bool = false; - const ONLY_HOSTS: bool = true; - - fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.path("src/doc/rustc-dev-guide") - } - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(RustcGuide); - } - - fn run(self, builder: &Builder<'_>) { - let src = builder.src.join("src/doc/rustc-dev-guide"); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); - let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) { - ToolState::TestPass - } else { - ToolState::TestFail - }; - builder.save_toolstate("rustc-dev-guide", toolstate); - } -} - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct CrateLibrustc { compiler: Compiler, diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs index 205524ad84fb7..fd95634fed64e 100644 --- a/src/bootstrap/toolstate.rs +++ b/src/bootstrap/toolstate.rs @@ -85,11 +85,8 @@ static STABLE_TOOLS: &[(&str, &str)] = &[ // We do require that we checked whether they build or not on the tools builder, // though, as otherwise we will be unable to file an issue if they start // failing. -static NIGHTLY_TOOLS: &[(&str, &str)] = &[ - ("miri", "src/tools/miri"), - ("embedded-book", "src/doc/embedded-book"), - // ("rustc-dev-guide", "src/doc/rustc-dev-guide"), -]; +static NIGHTLY_TOOLS: &[(&str, &str)] = + &[("miri", "src/tools/miri"), ("embedded-book", "src/doc/embedded-book")]; fn print_error(tool: &str, submodule: &str) { eprintln!(); diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide deleted file mode 160000 index 7adfab42bab04..0000000000000 --- a/src/doc/rustc-dev-guide +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7adfab42bab045a848126895c2f1e09927c1331a diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index 9f68c55ec975c..6201fa2e64b80 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -173,7 +173,6 @@ fn skip_markdown_path(path: &Path) -> bool { "src/doc/nomicon", "src/doc/reference", "src/doc/rust-by-example", - "src/doc/rustc-dev-guide", ]; SKIP_MD.iter().any(|p| path.ends_with(p)) }