auto merge of #20925 : alexcrichton/rust/more-flaky-test, r=sfackler

I saw these hanging on a windows bot, and the previous ones seem to have calmed
down after switching from Thread::spawn to Thread::scoped, so try that here as
well!

2 files changed, 2 insertions, 2 deletions

diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs
index 371fd677bd9..74802c156a2 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/run-pass/unwind-unique.rs
@@ -19,5 +19,5 @@ fn f() {
 }
 
 pub fn main() {
-    let _t = Thread::spawn(f);
+    let _t = Thread::scoped(f);
 }
diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/run-pass/weak-lang-item.rs
index 08dac5c7c82..b1c65d322ab 100644
--- a/src/test/run-pass/weak-lang-item.rs
+++ b/src/test/run-pass/weak-lang-item.rs
@@ -15,7 +15,7 @@ extern crate "weak-lang-items" as other;
 use std::thread::Thread;
 
 fn main() {
-    let _ = Thread::spawn(move|| {
+    let _ = Thread::scoped(move|| {
         other::foo()
     });
 }