Skip to content

Commit 53f294d

Browse files
committed
patch is no longer needed
1 parent e9cc3ef commit 53f294d

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

rust-src.diff

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +0,0 @@
1-
diff --git a/library/std/src/sync/mpsc/tests.rs b/library/std/src/sync/mpsc/tests.rs
2-
index 82c52eb4fef..1e52a4a705c 100644
3-
--- a/library/std/src/sync/mpsc/tests.rs
4-
+++ b/library/std/src/sync/mpsc/tests.rs
5-
@@ -713,10 +713,11 @@ fn issue_39364() {
6-
let t = thread::spawn(move || {
7-
thread::sleep(Duration::from_millis(300));
8-
let _ = tx.clone();
9-
- crate::mem::forget(tx);
10-
+ // Don't drop; hand back to caller.
11-
+ tx
12-
});
13-
14-
let _ = rx.recv_timeout(Duration::from_millis(500));
15-
- t.join().unwrap();
16-
+ let _tx = t.join().unwrap(); // delay dropping until end of test
17-
let _ = rx.recv_timeout(Duration::from_millis(500));
18-
}

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2022-11-14
1+
nightly-2022-11-17

0 commit comments

Comments
 (0)