Skip to content

Commit

Permalink
rustdoc: Don't panic when failing to write .lock file
Browse files Browse the repository at this point in the history
It can be treated like any other unexpected IO error.
  • Loading branch information
ollie27 committed Nov 23, 2019
1 parent f1b882b commit 05ef20f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
12 changes: 0 additions & 12 deletions src/librustc_data_structures/flock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,3 @@ cfg_if! {
}
}
}

impl Lock {
pub fn panicking_new(p: &Path,
wait: bool,
create: bool,
exclusive: bool)
-> Lock {
Lock::new(p, wait, create, exclusive).unwrap_or_else(|err| {
panic!("could not lock `{}`: {}", p.display(), err);
})
}
}
3 changes: 2 additions & 1 deletion src/librustdoc/html/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 05ef20f

Please sign in to comment.