about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-05-05 07:02:48 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-05-05 11:27:45 -0700
commit94e4b459efa3e75c190aeb50da88a02661b3d214 (patch)
tree5c26ccc1e97ccfa1bf663a94ffa29cfcdf40528a /src/libstd
parenta6ab049ed1db09f693df7d33046b3980f56751c1 (diff)
downloadrust-94e4b459efa3e75c190aeb50da88a02661b3d214.tar.gz
rust-94e4b459efa3e75c190aeb50da88a02661b3d214.zip
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/libstd')
-rw-r--r--src/libstd/thread/mod.rs4
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 {