Skip to content

Commit 4387a8b

Browse files
committed
Move rustc-guide submodule to rustc-dev-guide
1 parent c79f5f0 commit 4387a8b

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

Diff for: .gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
[submodule "src/stdarch"]
3232
path = src/stdarch
3333
url = https://github.com/rust-lang/stdarch.git
34-
[submodule "src/doc/rustc-guide"]
35-
path = src/doc/rustc-guide
36-
url = https://github.com/rust-lang/rustc-guide.git
34+
[submodule "src/doc/rustc-dev-guide"]
35+
path = src/doc/rustc-dev-guide
36+
url = https://github.com/rust-lang/rustc-dev-guide.git
3737
[submodule "src/doc/edition-guide"]
3838
path = src/doc/edition-guide
3939
url = https://github.com/rust-lang/edition-guide.git

Diff for: rustfmt.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ignore = [
2020
"src/doc/nomicon",
2121
"src/doc/reference",
2222
"src/doc/rust-by-example",
23-
"src/doc/rustc-guide",
23+
"src/doc/rustc-dev-guide",
2424
"src/llvm-project",
2525
"src/stdarch",
2626
"src/tools/cargo",

Diff for: src/bootstrap/test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1493,22 +1493,22 @@ impl Step for RustcGuide {
14931493
const ONLY_HOSTS: bool = true;
14941494

14951495
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1496-
run.path("src/doc/rustc-guide")
1496+
run.path("src/doc/rustc-dev-guide")
14971497
}
14981498

14991499
fn make_run(run: RunConfig<'_>) {
15001500
run.builder.ensure(RustcGuide);
15011501
}
15021502

15031503
fn run(self, builder: &Builder<'_>) {
1504-
let src = builder.src.join("src/doc/rustc-guide");
1504+
let src = builder.src.join("src/doc/rustc-dev-guide");
15051505
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
15061506
let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
15071507
ToolState::TestPass
15081508
} else {
15091509
ToolState::TestFail
15101510
};
1511-
builder.save_toolstate("rustc-guide", toolstate);
1511+
builder.save_toolstate("rustc-dev-guide", toolstate);
15121512
}
15131513
}
15141514

Diff for: src/bootstrap/toolstate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static STABLE_TOOLS: &[(&str, &str)] = &[
8989
static NIGHTLY_TOOLS: &[(&str, &str)] = &[
9090
("miri", "src/tools/miri"),
9191
("embedded-book", "src/doc/embedded-book"),
92-
("rustc-guide", "src/doc/rustc-guide"),
92+
("rustc-dev-guide", "src/doc/rustc-dev-guide"),
9393
];
9494

9595
fn print_error(tool: &str, submodule: &str) {

Diff for: src/ci/docker/x86_64-gnu-tools/checktools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ python2.7 "$X_PY" test --no-fail-fast \
1414
src/doc/rust-by-example \
1515
src/doc/embedded-book \
1616
src/doc/edition-guide \
17-
src/doc/rustc-guide \
17+
src/doc/rustc-dev-guide \
1818
src/tools/clippy \
1919
src/tools/rls \
2020
src/tools/rustfmt \

Diff for: src/doc/rustc-dev-guide

Submodule rustc-dev-guide added at 66be765

Diff for: src/doc/rustc-guide

-1
This file was deleted.

Diff for: src/tools/publish_toolstate.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
'ryankurte', 'thejpster', 'therealprof',
4242
},
4343
'edition-guide': {'ehuss', 'Centril', 'steveklabnik'},
44-
'rustc-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'},
44+
'rustc-dev-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'},
4545
}
4646

4747
REPOS = {
@@ -55,7 +55,7 @@
5555
'rust-by-example': 'https://github.com/rust-lang/rust-by-example',
5656
'embedded-book': 'https://github.com/rust-embedded/book',
5757
'edition-guide': 'https://github.com/rust-lang/edition-guide',
58-
'rustc-guide': 'https://github.com/rust-lang/rustc-guide',
58+
'rustc-dev-guide': 'https://github.com/rust-lang/rustc-dev-guide',
5959
}
6060

6161

@@ -204,7 +204,7 @@ def update_latest(
204204
old = status[os]
205205
new = s.get(tool, old)
206206
status[os] = new
207-
maintainers = ' '.join('@'+name for name in MAINTAINERS[tool])
207+
maintainers = ' '.join('@'+name for name in MAINTAINERS.get(tool, ())
208208
# comparing the strings, but they are ordered appropriately:
209209
# "test-pass" > "test-fail" > "build-fail"
210210
if new > old:

0 commit comments

Comments
 (0)