diff options
| author | bors <bors@rust-lang.org> | 2015-03-20 20:19:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-20 20:19:42 +0000 |
| commit | 68d69415637186755482d2584e6ba82b67bc1d89 (patch) | |
| tree | 702068026393f26edf8b134f8dca0219dd1c0255 /src/libstd/sys/windows/timer.rs | |
| parent | 3900c089a1305f06c6dbb15d07127b4e3a8f040c (diff) | |
| parent | 1cc9718fdef63476ffdf3f0bcd74b554b083f378 (diff) | |
| download | rust-68d69415637186755482d2584e6ba82b67bc1d89.tar.gz rust-68d69415637186755482d2584e6ba82b67bc1d89.zip | |
Auto merge of #23267 - alexcrichton:issue-20012, r=aturon
This reverts commit aec67c2. Closes #20012 This is temporarily rebased on #23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.
Diffstat (limited to 'src/libstd/sys/windows/timer.rs')
| -rw-r--r-- | src/libstd/sys/windows/timer.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/timer.rs b/src/libstd/sys/windows/timer.rs index 91a7f694181..9bcae926eea 100644 --- a/src/libstd/sys/windows/timer.rs +++ b/src/libstd/sys/windows/timer.rs @@ -80,9 +80,10 @@ fn helper(input: libc::HANDLE, messages: Receiver<Req>, _: ()) { None => {} } } + // See the comment in unix::timer for why we don't have any + // asserts here and why we're likely just leaving timers on + // the floor as we exit. Err(TryRecvError::Disconnected) => { - assert_eq!(objs.len(), 1); - assert_eq!(chans.len(), 0); break 'outer; } Err(..) => break |