diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-02-19 05:12:20 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-02-19 05:12:20 +0000 |
| commit | e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb (patch) | |
| tree | cf3e5436c033a6b38daa21eb498b7f53d417936c /compiler/rustc_errors | |
| parent | 6b6da93e51851d098574b5e6f39b6d187e78f34a (diff) | |
| parent | d5735645753e990a72446094f703df9b5e421555 (diff) | |
| download | rust-e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb.tar.gz rust-e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/Cargo.toml | 2 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/lock.rs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml index a2d1fd2a924..cc114fdcd8c 100644 --- a/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml @@ -30,7 +30,7 @@ unicode-width = "0.1.4" # tidy-alphabetical-end [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +version = "0.52.0" features = [ "Win32_Foundation", "Win32_Security", diff --git a/compiler/rustc_errors/src/lock.rs b/compiler/rustc_errors/src/lock.rs index bd5cf49b56b..0aeb511214b 100644 --- a/compiler/rustc_errors/src/lock.rs +++ b/compiler/rustc_errors/src/lock.rs @@ -27,7 +27,8 @@ pub fn acquire_global_lock(name: &str) -> Box<dyn Any> { impl Drop for Handle { fn drop(&mut self) { unsafe { - CloseHandle(self.0); + // FIXME can panic here + CloseHandle(self.0).unwrap(); } } } @@ -37,7 +38,8 @@ pub fn acquire_global_lock(name: &str) -> Box<dyn Any> { impl Drop for Guard { fn drop(&mut self) { unsafe { - ReleaseMutex((self.0).0); + // FIXME can panic here + ReleaseMutex((self.0).0).unwrap(); } } } |