Skip to content

Commit 55d4287

Browse files
committed
Remove rustc-dev-guide submodule
Rationale: * The submodule hasn't been updated in 10 months (since April 2020) * It's unlikely that there's a need for it to be a submodule -- people can just clone the rust-lang/rustc-dev-guide repo * Submodules are a pain See also the [discussion on Zulip][z]. [z]: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/rustc-dev-guide.20submodule
1 parent a73c2e5 commit 55d4287

File tree

7 files changed

+2
-40
lines changed

7 files changed

+2
-40
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
[submodule "library/stdarch"]
2929
path = library/stdarch
3030
url = https://github.com/rust-lang/stdarch.git
31-
[submodule "src/doc/rustc-dev-guide"]
32-
path = src/doc/rustc-dev-guide
33-
url = https://github.com/rust-lang/rustc-dev-guide.git
3431
[submodule "src/doc/edition-guide"]
3532
path = src/doc/edition-guide
3633
url = https://github.com/rust-lang/edition-guide.git

rustfmt.toml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ignore = [
2323
"src/doc/nomicon",
2424
"src/doc/reference",
2525
"src/doc/rust-by-example",
26-
"src/doc/rustc-dev-guide",
2726
"src/llvm-project",
2827
"src/tools/cargo",
2928
"src/tools/clippy",

src/bootstrap/builder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ impl<'a> Builder<'a> {
413413
test::UnstableBook,
414414
test::RustcBook,
415415
test::LintDocs,
416-
test::RustcGuide,
417416
test::EmbeddedBook,
418417
test::EditionGuide,
419418
test::Rustfmt,

src/bootstrap/test.rs

-28
Original file line numberDiff line numberDiff line change
@@ -1536,34 +1536,6 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
15361536
}
15371537
}
15381538

1539-
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
1540-
pub struct RustcGuide;
1541-
1542-
impl Step for RustcGuide {
1543-
type Output = ();
1544-
const DEFAULT: bool = false;
1545-
const ONLY_HOSTS: bool = true;
1546-
1547-
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1548-
run.path("src/doc/rustc-dev-guide")
1549-
}
1550-
1551-
fn make_run(run: RunConfig<'_>) {
1552-
run.builder.ensure(RustcGuide);
1553-
}
1554-
1555-
fn run(self, builder: &Builder<'_>) {
1556-
let src = builder.src.join("src/doc/rustc-dev-guide");
1557-
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
1558-
let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
1559-
ToolState::TestPass
1560-
} else {
1561-
ToolState::TestFail
1562-
};
1563-
builder.save_toolstate("rustc-dev-guide", toolstate);
1564-
}
1565-
}
1566-
15671539
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
15681540
pub struct CrateLibrustc {
15691541
compiler: Compiler,

src/bootstrap/toolstate.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,8 @@ static STABLE_TOOLS: &[(&str, &str)] = &[
8585
// We do require that we checked whether they build or not on the tools builder,
8686
// though, as otherwise we will be unable to file an issue if they start
8787
// failing.
88-
static NIGHTLY_TOOLS: &[(&str, &str)] = &[
89-
("miri", "src/tools/miri"),
90-
("embedded-book", "src/doc/embedded-book"),
91-
// ("rustc-dev-guide", "src/doc/rustc-dev-guide"),
92-
];
88+
static NIGHTLY_TOOLS: &[(&str, &str)] =
89+
&[("miri", "src/tools/miri"), ("embedded-book", "src/doc/embedded-book")];
9390

9491
fn print_error(tool: &str, submodule: &str) {
9592
eprintln!();

src/doc/rustc-dev-guide

-1
This file was deleted.

src/tools/tidy/src/style.rs

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ fn skip_markdown_path(path: &Path) -> bool {
173173
"src/doc/nomicon",
174174
"src/doc/reference",
175175
"src/doc/rust-by-example",
176-
"src/doc/rustc-dev-guide",
177176
];
178177
SKIP_MD.iter().any(|p| path.ends_with(p))
179178
}

0 commit comments

Comments
 (0)