user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't return a Result from symlink_dir_force

Browse source 
this gives a more helpful backtrace if it fails

before:
```
  thread 'main' panicked at 'symlink_dir_force(&builder.config, &out, &out_dir) failed with No such file or directory (os error 2)', doc.rs:697:9
```

after:
```
thread 'main' panicked at 'symlink_dir(config, original, link) failed with No such file or directory (os error 2) ("failed to create link from /home/jyn/src/rust2/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/doc -> /home/jyn/src/rust2/build/x86_64-unknown-linux-gnu/compiler-doc")', doc.rs:975:5
```
This commit is contained in:
jyn 2023-06-03 14:45:43 -05:00
parent c57eb1bb6e
commit 3f05b1fb2c
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bootstrap/doc.rs
View file

@ -8,7 +8,6 @@
//! `rustdoc`.
use std::fs;
use std::io;
use std::path::{Path, PathBuf};
use crate::builder::crate_description;
@ -694,11 +693,11 @@ impl Step for Rustc {
// rustc. rustdoc needs to be able to see everything, for example when
// merging the search index, or generating local (relative) links.
let out_dir = builder.stage_out(compiler, Mode::Rustc).join(target.triple).join("doc");
t!(symlink_dir_force(&builder.config, &out, &out_dir));
symlink_dir_force(&builder.config, &out, &out_dir);
// Cargo puts proc macros in `target/doc` even if you pass `--target`
// explicitly (https://github.com/rust-lang/cargo/issues/7677).
let proc_macro_out_dir = builder.stage_out(compiler, Mode::Rustc).join("doc");
t!(symlink_dir_force(&builder.config, &out, &proc_macro_out_dir));
symlink_dir_force(&builder.config, &out, &proc_macro_out_dir);
// Build cargo command.
let mut cargo = builder.cargo(compiler, Mode::Rustc, SourceType::InTree, target, "doc");
@ -816,7 +815,7 @@ macro_rules! tool_doc {
];
for out_dir in out_dirs {
t!(fs::create_dir_all(&out_dir));
t!(symlink_dir_force(&builder.config, &out, &out_dir));
symlink_dir_force(&builder.config, &out, &out_dir);
}
// Build cargo command.
@ -959,21 +958,24 @@ impl Step for UnstableBookGen {
}
}
fn symlink_dir_force(config: &Config, original: &Path, link: &Path) -> io::Result<()> {
fn symlink_dir_force(config: &Config, original: &Path, link: &Path) {
if config.dry_run() {
return Ok(());
return;
}
if let Ok(m) = fs::symlink_metadata(link) {
if m.file_type().is_dir() {
fs::remove_dir_all(link)?;
t!(fs::remove_dir_all(link));
} else {
// handle directory junctions on windows by falling back to
// `remove_dir`.
fs::remove_file(link).or_else(|_| fs::remove_dir(link))?;
t!(fs::remove_file(link).or_else(|_| fs::remove_dir(link)));
}
}
symlink_dir(config, original, link)
t!(
symlink_dir(config, original, link),
format!("failed to create link from {} -> {}", link.display(), original.display())
);
}
#[derive(Ord, PartialOrd, Debug, Copy, Clone, Hash, PartialEq, Eq)]