Skip to content

Commit 71a71ce

Browse files
committed
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 parents d2d35db + b8304e5 commit 71a71ce

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/test/run-pass/unwind-unique.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ fn f() {
1919
}
2020

2121
pub fn main() {
22-
let _t = Thread::spawn(f);
22+
let _t = Thread::scoped(f);
2323
}

src/test/run-pass/weak-lang-item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern crate "weak-lang-items" as other;
1515
use std::thread::Thread;
1616

1717
fn main() {
18-
let _ = Thread::spawn(move|| {
18+
let _ = Thread::scoped(move|| {
1919
other::foo()
2020
});
2121
}

0 commit comments

Comments
 (0)