Skip to content

Commit

Permalink
Auto merge of #41769 - alexcrichton:fix-doc-test, r=aturon
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed May 5, 2017
2 parents 302dfd6 + 94e4b45 commit f420965
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/libstd/thread/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit f420965

Please sign in to comment.