diff options
| author | bors <bors@rust-lang.org> | 2017-05-05 20:44:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-05 20:44:15 +0000 |
| commit | f4209651ec4d4455dab4fc3f3a3456a897d9da7f (patch) | |
| tree | d9c9ccf1da3873d4101a63ba4b0118c09f92dd66 /src | |
| parent | 302dfd6c9d14ef9cd3140aed6ab9a65d6a0a1a51 (diff) | |
| parent | 94e4b459efa3e75c190aeb50da88a02661b3d214 (diff) | |
| download | rust-f4209651ec4d4455dab4fc3f3a3456a897d9da7f.tar.gz rust-f4209651ec4d4455dab4fc3f3a3456a897d9da7f.zip | |
Auto merge of #41769 - alexcrichton:fix-doc-test, r=aturon
std: Prevent deadlocks in doctests on Windows Windows historically has problems with threads panicking and the main thread exiting at the same time, typically causing deadlocks. In the past (#25824) we've joined on threads but this just prevents running the test for now to avoid tampering with the example.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/thread/mod.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 8e7eaa77cd7..9cded2ab289 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -723,7 +723,9 @@ struct Inner { /// /// # Examples /// -/// ``` +/// ```no_run +/// # // Note that this example isn't executed by default because it causes +/// # // deadlocks on Windows unfortunately (see #25824) /// use std::thread::Builder; /// /// for i in 0..5 { |