rustdoc: Handle concurrent mkdir requests
It's likely that `rustdoc` as a tool is run concurrently in the same output (e.g. documenting multiple crates as Cargo does), in which case it needs to handle concurrent calls to `fs::create_dir`.
This commit is contained in:
parent
8d0dd7876e
commit
36d9ee3da9
@ -820,13 +820,16 @@ fn write(dst: PathBuf, contents: &[u8]) -> Result<(), Error> {
|
|||||||
Ok(try_err!(try_err!(File::create(&dst), &dst).write_all(contents), &dst))
|
Ok(try_err!(try_err!(File::create(&dst), &dst).write_all(contents), &dst))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Makes a directory on the filesystem, failing the thread if an error occurs and
|
/// Makes a directory on the filesystem, failing the thread if an error occurs
|
||||||
/// skipping if the directory already exists.
|
/// and skipping if the directory already exists.
|
||||||
|
///
|
||||||
|
/// Note that this also handles races as rustdoc is likely to be run
|
||||||
|
/// concurrently against another invocation.
|
||||||
fn mkdir(path: &Path) -> io::Result<()> {
|
fn mkdir(path: &Path) -> io::Result<()> {
|
||||||
if !path.exists() {
|
match fs::create_dir(path) {
|
||||||
fs::create_dir(path)
|
Ok(()) => Ok(()),
|
||||||
} else {
|
Err(ref e) if e.kind() == io::ErrorKind::AlreadyExists => Ok(()),
|
||||||
Ok(())
|
Err(e) => Err(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user