diff options
author | bors <bors@rust-lang.org> | 2020-04-04 18:17:14 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2020-04-04 18:17:14 +0000 |
commit | 853c4774e26ea97b45fe74de9a6f68e526784323 (patch) | |
tree | b761ab3637064129275773dc736f8786a57ae89c | |
parent | cff07db629d7522a0ae4e05865f66f3186e70970 (diff) | |
parent | dcf70044de3fdbad55c498db8a59173f9d360ff8 (diff) | |
download | rust-853c4774e26ea97b45fe74de9a6f68e526784323.tar.gz |
Auto merge of #69898 - spastorino:rename-rustc-guide2, r=Xanewok
Move rustc-guide submodule to rustc-dev-guide
r? @pietroalbini
-rw-r--r-- | .gitmodules | 6 | ||||
-rw-r--r-- | rustfmt.toml | 2 | ||||
-rw-r--r-- | src/bootstrap/test.rs | 6 | ||||
-rw-r--r-- | src/bootstrap/toolstate.rs | 2 | ||||
-rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 2 | ||||
m--------- | src/doc/rustc-dev-guide | 0 | ||||
m--------- | src/doc/rustc-guide | 0 | ||||
-rwxr-xr-x | src/tools/publish_toolstate.py | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index 003e50d0788..b2b580d08bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,9 @@ [submodule "src/stdarch"] path = src/stdarch url = https://github.com/rust-lang/stdarch.git -[submodule "src/doc/rustc-guide"] - path = src/doc/rustc-guide - url = https://github.com/rust-lang/rustc-guide.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 8f4c901fb97..9b2c0820036 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -20,7 +20,7 @@ ignore = [ "src/doc/nomicon", "src/doc/reference", "src/doc/rust-by-example", - "src/doc/rustc-guide", + "src/doc/rustc-dev-guide", "src/llvm-project", "src/stdarch", "src/tools/cargo", diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 2499856235f..0bf507f9ebb 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1532,7 +1532,7 @@ impl Step for RustcGuide { const ONLY_HOSTS: bool = true; fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.path("src/doc/rustc-guide") + run.path("src/doc/rustc-dev-guide") } fn make_run(run: RunConfig<'_>) { @@ -1540,14 +1540,14 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { - let src = builder.src.join("src/doc/rustc-guide"); + 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-guide", toolstate); + builder.save_toolstate("rustc-dev-guide", toolstate); } } diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs index f0e0f92af55..095c3c03c30 100644 --- a/src/bootstrap/toolstate.rs +++ b/src/bootstrap/toolstate.rs @@ -89,7 +89,7 @@ static STABLE_TOOLS: &[(&str, &str)] = &[ static NIGHTLY_TOOLS: &[(&str, &str)] = &[ ("miri", "src/tools/miri"), ("embedded-book", "src/doc/embedded-book"), - ("rustc-guide", "src/doc/rustc-guide"), + ("rustc-dev-guide", "src/doc/rustc-dev-guide"), ]; fn print_error(tool: &str, submodule: &str) { diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index e57fe227139..72325c7b948 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -14,7 +14,7 @@ python2.7 "$X_PY" test --no-fail-fast \ src/doc/rust-by-example \ src/doc/embedded-book \ src/doc/edition-guide \ - src/doc/rustc-guide \ + src/doc/rustc-dev-guide \ src/tools/clippy \ src/tools/rls \ src/tools/rustfmt \ diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide new file mode 160000 +Subproject 66be765404efb82c6bc2735473cbd3472f777dc diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide deleted file mode 160000 -Subproject 5bd60bc51efaec04e69e2e18b59678e2af06643 diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py index 6cc20a241ac..b55ead088ca 100755 --- a/src/tools/publish_toolstate.py +++ b/src/tools/publish_toolstate.py @@ -40,7 +40,7 @@ MAINTAINERS = { 'ryankurte', 'thejpster', 'therealprof', }, 'edition-guide': {'ehuss', 'Centril', 'steveklabnik'}, - 'rustc-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'}, + 'rustc-dev-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'}, } REPOS = { @@ -54,7 +54,7 @@ REPOS = { 'rust-by-example': 'https://github.com/rust-lang/rust-by-example', 'embedded-book': 'https://github.com/rust-embedded/book', 'edition-guide': 'https://github.com/rust-lang/edition-guide', - 'rustc-guide': 'https://github.com/rust-lang/rustc-guide', + 'rustc-dev-guide': 'https://github.com/rust-lang/rustc-dev-guide', } @@ -202,7 +202,7 @@ def update_latest( old = status[os] new = s.get(tool, old) status[os] = new - maintainers = ' '.join('@'+name for name in MAINTAINERS[tool]) + maintainers = ' '.join('@'+name for name in MAINTAINERS.get(tool, ())) # comparing the strings, but they are ordered appropriately: # "test-pass" > "test-fail" > "build-fail" if new > old: |