Move rustc-guide submodule to rustc-dev-guide

abao168899 · Mar 24, 2020 · 4387a8b · 4387a8b
1 parent c79f5f0
commit 4387a8b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -1493,22 +1493,22 @@ 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<'_>) {
  run.builder.ensure(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
@@ -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
@@ -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
diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide
diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py
@@ -41,7 +41,7 @@
  '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 = {
@@ -55,7 +55,7 @@
  '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',
 }
 
 
@@ -204,7 +204,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: