OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #69898 - spastorino:rename-rustc-guide2, r=Xanewok

Browse Source 
Move rustc-guide submodule to rustc-dev-guide

r? @pietroalbini
This commit is contained in:
bors 2020-04-04 18:17:14 +00:00
commit 853c4774e2
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -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

2
rustfmt.toml
View File

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

6
src/bootstrap/test.rs
View File

@ -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);
}
}

2
src/bootstrap/toolstate.rs
View File

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

2
src/ci/docker/x86_64-gnu-tools/checktools.sh
View File

@ -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 \

1
src/doc/rustc-dev-guide Submodule

@ -0,0 +1 @@
Subproject commit 66be765404efb82c6bc2735473cbd3472f777dc0

1
src/doc/rustc-guide

@ -1 +0,0 @@
Subproject commit 5bd60bc51efaec04e69e2e18b59678e2af066433

6
src/tools/publish_toolstate.py
View File

@ -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: