diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:53 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:53 -0700 |
| commit | aff160bb0343c9d09b93b2deb045ae51d18ade34 (patch) | |
| tree | 47f3af7e6ee60e7bb0a008320918f1429e16291e /src/liballoc | |
| parent | 45f1324037b098d6e92da7b34cc0aba274fdae97 (diff) | |
| parent | fa3840305c7aad322ef76453748ad44f7f0eba1b (diff) | |
| download | rust-aff160bb0343c9d09b93b2deb045ae51d18ade34.tar.gz rust-aff160bb0343c9d09b93b2deb045ae51d18ade34.zip | |
rollup merge of #23775: alexcrichton/fix-flaky-test
Windows gets quite unhappy when a thread fails while the main thread is exiting, frequently leading to process deadlock. This has been causing quite a few deadlocks on the windows bots recently. The child threads are presumably failing because the `println!` is failing due to the main thread being shut down.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index f3b72e4a9ee..338d7e33631 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -33,7 +33,7 @@ //! //! Sharing some immutable data between tasks: //! -//! ``` +//! ```no_run //! use std::sync::Arc; //! use std::thread; //! @@ -50,7 +50,7 @@ //! //! Sharing mutable data safely between tasks with a `Mutex`: //! -//! ``` +//! ```no_run //! use std::sync::{Arc, Mutex}; //! use std::thread; //! |
