nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-01 11:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #74861 - mark-i-m:mv-std-followup, r=Mark-Simulacrum

Browse Source 
Re-enable linkcheck after moving std
This commit is contained in:
bors 2020-07-28 21:48:22 +00:00
commit a7eff79135
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/builder/tests.rs
View File

@ -546,9 +546,7 @@ mod dist {
);
}
//FIXME(mark-i-m): reinstate this test when things are fixed...
//#[test]
#[allow(dead_code)]
#[test]
fn test_docs() {
// Behavior of `x.py test` doing various documentation tests.
let mut config = configure(&[], &[]);

1
src/bootstrap/doc.rs
View File

@ -693,6 +693,7 @@ impl Step for UnstableBookGen {
builder.create_dir(&out);
builder.remove_dir(&out);
let mut cmd = builder.tool_cmd(Tool::UnstableBookGen);
cmd.arg(builder.src.join("library"));
cmd.arg(builder.src.join("src"));
cmd.arg(out);

19
src/bootstrap/test.rs
View File

@ -106,19 +106,18 @@ impl Step for Linkcheck {
///
/// This tool in `src/tools` will verify the validity of all our links in the
/// documentation to ensure we don't have a bunch of dead ones.
fn run(self, _builder: &Builder<'_>) {
// FIXME(mark-i-m): uncomment this after we fix the links...
// let host = self.host;
fn run(self, builder: &Builder<'_>) {
let host = self.host;
// builder.info(&format!("Linkcheck ({})", host));
builder.info(&format!("Linkcheck ({})", host));
// builder.default_doc(None);
builder.default_doc(None);
// let _time = util::timeit(&builder);
// try_run(
// builder,
// builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
// );
let _time = util::timeit(&builder);
try_run(
builder,
builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
);
}
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

8
src/tools/unstable-book-gen/src/main.rs
View File

@ -94,13 +94,15 @@ fn copy_recursive(from: &Path, to: &Path) {
}
fn main() {
let src_path_str = env::args_os().skip(1).next().expect("source path required");
let dest_path_str = env::args_os().skip(2).next().expect("destination path required");
let library_path_str = env::args_os().skip(1).next().expect("library path required");
let src_path_str = env::args_os().skip(2).next().expect("source path required");
let dest_path_str = env::args_os().skip(3).next().expect("destination path required");
let library_path = Path::new(&library_path_str);
let src_path = Path::new(&src_path_str);
let dest_path = Path::new(&dest_path_str);
let lang_features = collect_lang_features(src_path, &mut false);
let lib_features = collect_lib_features(src_path)
let lib_features = collect_lib_features(library_path)
.into_iter()
.filter(|&(ref name, _)| !lang_features.contains_key(name))
.collect();