Skip to content

Commit 38a5edb

Browse files
committed
auto merge of #11180 : alexcrichton/rust/fix-deferred-send, r=cmr
I forgot to add this back in after I removed can_resched and then realized I had to add it back.
2 parents b90989a + 0aab974 commit 38a5edb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/libstd/comm/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ impl<T: Send> Chan<T> {
599599
// the TLS overhead can be a bit much.
600600
n => {
601601
assert!(n >= 0);
602-
if n > 0 && n % RESCHED_FREQ == 0 {
602+
if can_resched && n > 0 && n % RESCHED_FREQ == 0 {
603603
let task: ~Task = Local::take();
604604
task.maybe_yield();
605605
}

0 commit comments

Comments
 (0)