diff options
| author | bors <bors@rust-lang.org> | 2021-02-09 05:57:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-09 05:57:18 +0000 |
| commit | f4008fe94935d05ffb3a48fc5b7149070bb45550 (patch) | |
| tree | fbc9bd43c3b0c1ce5e27a01c0541f7b69a9838fc /library/std/src | |
| parent | 36931ce3d90e1927e8589d973cc8d18103ede460 (diff) | |
| parent | d2e204d1586e7ecee99a24657f6cbc1a9ac6561d (diff) | |
| download | rust-f4008fe94935d05ffb3a48fc5b7149070bb45550.tar.gz rust-f4008fe94935d05ffb3a48fc5b7149070bb45550.zip | |
Auto merge of #81905 - Dylan-DPC:rollup-mxpz1j7, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #72209 (Add checking for no_mangle to unsafe_code lint) - #80732 (Allow Trait inheritance with cycles on associated types take 2) - #81697 (Add "every" as a doc alias for "all".) - #81826 (Prefer match over combinators to make some Box methods inlineable) - #81834 (Resolve typedef in HashMap lldb pretty-printer only if possible) - #81841 ([rustbuild] Output rustdoc-json-types docs ) - #81849 (Expand the docs for ops::ControlFlow a bit) - #81876 (parser: Fix panic in 'const impl' recovery) - #81882 (:arrow_up: rust-analyzer) - #81888 (Fix pretty printer macro_rules with semicolon.) - #81896 (Remove outdated comment in windows' mutex.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/windows/mutex.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/std/src/sys/windows/mutex.rs b/library/std/src/sys/windows/mutex.rs index 72a0993d94d..12c5ea741f9 100644 --- a/library/std/src/sys/windows/mutex.rs +++ b/library/std/src/sys/windows/mutex.rs @@ -23,8 +23,6 @@ pub struct Mutex { } // Windows SRW Locks are movable (while not borrowed). -// ReentrantMutexes (in Inner) are not, but those are stored indirectly through -// a Box, so do not move when the Mutex it self is moved. pub type MovableMutex = Mutex; unsafe impl Send for Mutex {} |