Skip to content

Commit 853c477

Browse files
committed
Auto merge of #69898 - spastorino:rename-rustc-guide2, r=Xanewok
Move rustc-guide submodule to rustc-dev-guide r? @pietroalbini
2 parents cff07db + dcf7004 commit 853c477

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.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

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",

src/bootstrap/test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1532,22 +1532,22 @@ impl Step for RustcGuide {
15321532
const ONLY_HOSTS: bool = true;
15331533

15341534
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1535-
run.path("src/doc/rustc-guide")
1535+
run.path("src/doc/rustc-dev-guide")
15361536
}
15371537

15381538
fn make_run(run: RunConfig<'_>) {
15391539
run.builder.ensure(RustcGuide);
15401540
}
15411541

15421542
fn run(self, builder: &Builder<'_>) {
1543-
let src = builder.src.join("src/doc/rustc-guide");
1543+
let src = builder.src.join("src/doc/rustc-dev-guide");
15441544
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
15451545
let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
15461546
ToolState::TestPass
15471547
} else {
15481548
ToolState::TestFail
15491549
};
1550-
builder.save_toolstate("rustc-guide", toolstate);
1550+
builder.save_toolstate("rustc-dev-guide", toolstate);
15511551
}
15521552
}
15531553

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) {

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 \

src/doc/rustc-dev-guide

Submodule rustc-dev-guide added at 66be765

src/doc/rustc-guide

-1
This file was deleted.

src/tools/publish_toolstate.py

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

4646
REPOS = {
@@ -54,7 +54,7 @@
5454
'rust-by-example': 'https://github.com/rust-lang/rust-by-example',
5555
'embedded-book': 'https://github.com/rust-embedded/book',
5656
'edition-guide': 'https://github.com/rust-lang/edition-guide',
57-
'rustc-guide': 'https://github.com/rust-lang/rustc-guide',
57+
'rustc-dev-guide': 'https://github.com/rust-lang/rustc-dev-guide',
5858
}
5959

6060

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

0 commit comments

Comments
 (0)