bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #66657 - ollie27:rustdoc_flock_panic, r=GuillaumeGomez

Browse source 
rustdoc: Don't panic when failing to write .lock file

It can be treated like any other unexpected IO error.

I couldn't think of a good way to add a test for this unfortunately.

r? @GuillaumeGomez
This commit is contained in:
Mazdak Farrokhzad 2019-11-23 23:22:38 +01:00 • committed by GitHub
commit 0bb06cbea9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustdoc/html/render.rs
View file

@ -546,7 +546,8 @@ fn write_shared(
// Write out the shared files. Note that these are shared among all rustdoc
// docs placed in the output directory, so this needs to be a synchronized
// operation with respect to all other rustdocs running around.
let _lock = flock::Lock::panicking_new(&cx.dst.join(".lock"), true, true, true);
let lock_file = cx.dst.join(".lock");
let _lock = try_err!(flock::Lock::new(&lock_file, true, true, true), &lock_file);
// Add all the static files. These may already exist, but we just
// overwrite them anyway to make sure that they're fresh and up-to-date.