diff options
| author | bors <bors@rust-lang.org> | 2018-05-09 13:28:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-09 13:28:15 +0000 |
| commit | ac287ed167f07619409928008e4a50eecac4a285 (patch) | |
| tree | af5a99bdfb479ee083a98e8f13e5dab963735b75 /src/libstd/sys_common | |
| parent | 8ff4b42064b374bb62043f7729f84b6d979c7667 (diff) | |
| parent | 99cd9a9f401de3bf2f8c44f9e61bc505cd663a18 (diff) | |
| download | rust-ac287ed167f07619409928008e4a50eecac4a285.tar.gz rust-ac287ed167f07619409928008e4a50eecac4a285.zip | |
Auto merge of #50546 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests Successful merges: - #49988 (Mention Result<!, E> in never docs.) - #50148 (turn `ManuallyDrop::new` into a constant function) - #50456 (Update the Cargo submodule) - #50460 (Make `String::new()` const) - #50464 (Remove some transmutes) - #50505 (Added regression function match value test) - #50511 (Add some explanations for #[must_use]) - #50525 (Optimize string handling in lit_token().) - #50527 (Cleanup a `use` in a raw_vec test) - #50539 (Add more logarithm constants) - #49523 (Update RELEASES.md for 1.26.0) Failed merges:
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/remutex.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/remutex.rs b/src/libstd/sys_common/remutex.rs index ce43ec6d9ab..022056f8a8a 100644 --- a/src/libstd/sys_common/remutex.rs +++ b/src/libstd/sys_common/remutex.rs @@ -41,7 +41,7 @@ unsafe impl<T: Send> Sync for ReentrantMutex<T> {} /// because implementation of the trait would violate Rust’s reference aliasing /// rules. Use interior mutability (usually `RefCell`) in order to mutate the /// guarded data. -#[must_use] +#[must_use = "if unused the ReentrantMutex will immediately unlock"] pub struct ReentrantMutexGuard<'a, T: 'a> { // funny underscores due to how Deref currently works (it disregards field // privacy). |