Skip to content

Commit f420965

Browse files
committed
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.
2 parents 302dfd6 + 94e4b45 commit f420965

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/libstd/thread/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,9 @@ struct Inner {
723723
///
724724
/// # Examples
725725
///
726-
/// ```
726+
/// ```no_run
727+
/// # // Note that this example isn't executed by default because it causes
728+
/// # // deadlocks on Windows unfortunately (see #25824)
727729
/// use std::thread::Builder;
728730
///
729731
/// for i in 0..5 {

0 commit comments

Comments
 (0)