Change panic handling in scoped thread

- Panic instead of returning result - Do not own join handles in main thread
crossbeam-rs · Jun 1, 2022 · e637a68 · e637a68
1 parent 78b7ac3
commit e637a68
Show file tree

Hide file tree

Showing 44 changed files with 376 additions and 570 deletions.
diff --git a/crossbeam-channel/benches/crossbeam.rs b/crossbeam-channel/benches/crossbeam.rs
@@ -64,8 +64,7 @@ mod unbounded {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -93,8 +92,7 @@ mod unbounded {
                 r2.recv().unwrap();
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -129,8 +127,7 @@ mod unbounded {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -165,8 +162,7 @@ mod unbounded {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -208,8 +204,7 @@ mod unbounded {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 }
 
@@ -241,8 +236,7 @@ mod bounded_n {
                 r2.recv().unwrap();
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -277,8 +271,7 @@ mod bounded_n {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -313,8 +306,7 @@ mod bounded_n {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -347,8 +339,7 @@ mod bounded_n {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -391,8 +382,7 @@ mod bounded_n {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 }
 
@@ -438,8 +428,7 @@ mod bounded_1 {
                 r2.recv().unwrap();
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -474,8 +463,7 @@ mod bounded_1 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -510,8 +498,7 @@ mod bounded_1 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -553,8 +540,7 @@ mod bounded_1 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 }
 
@@ -591,8 +577,7 @@ mod bounded_0 {
                 r2.recv().unwrap();
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -627,8 +612,7 @@ mod bounded_0 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -663,8 +647,7 @@ mod bounded_0 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 
     #[bench]
@@ -706,7 +689,6 @@ mod bounded_0 {
                 }
             });
             drop(s1);
-        })
-        .unwrap();
+        });
     }
 }
diff --git a/crossbeam-channel/benchmarks/atomicring.rs b/crossbeam-channel/benchmarks/atomicring.rs
@@ -49,8 +49,7 @@ fn spsc(cap: usize) {
                 }
             }
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc(cap: usize) {
@@ -80,8 +79,7 @@ fn mpsc(cap: usize) {
                 }
             }
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpmc(cap: usize) {
@@ -114,8 +112,7 @@ fn mpmc(cap: usize) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/atomicringqueue.rs b/crossbeam-channel/benchmarks/atomicringqueue.rs
@@ -43,8 +43,7 @@ fn spsc(cap: usize) {
         for _ in 0..MESSAGES {
             q.pop();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc(cap: usize) {
@@ -68,8 +67,7 @@ fn mpsc(cap: usize) {
         for _ in 0..MESSAGES {
             q.pop();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpmc(cap: usize) {
@@ -97,8 +95,7 @@ fn mpmc(cap: usize) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/bus.rs b/crossbeam-channel/benchmarks/bus.rs
@@ -31,8 +31,7 @@ fn spsc(cap: usize) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/chan.rs b/crossbeam-channel/benchmarks/chan.rs
@@ -37,8 +37,7 @@ fn spsc(cap: Option<usize>) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc(cap: Option<usize>) {
@@ -56,8 +55,7 @@ fn mpsc(cap: Option<usize>) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpmc(cap: Option<usize>) {
@@ -79,8 +77,7 @@ fn mpmc(cap: Option<usize>) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn select_rx(cap: Option<usize>) {
@@ -109,8 +106,7 @@ fn select_rx(cap: Option<usize>) {
                 rx3.recv() -> m => assert!(m.is_some()),
             }
         }
-    })
-    .unwrap();
+    });
 }
 
 fn select_both(cap: Option<usize>) {
@@ -155,8 +151,7 @@ fn select_both(cap: Option<usize>) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/crossbeam-channel.rs b/crossbeam-channel/benchmarks/crossbeam-channel.rs
@@ -37,8 +37,7 @@ fn spsc(cap: Option<usize>) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc(cap: Option<usize>) {
@@ -56,8 +55,7 @@ fn mpsc(cap: Option<usize>) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpmc(cap: Option<usize>) {
@@ -79,8 +77,7 @@ fn mpmc(cap: Option<usize>) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn select_rx(cap: Option<usize>) {
@@ -105,8 +102,7 @@ fn select_rx(cap: Option<usize>) {
             let index = case.index();
             case.recv(&chans[index].1).unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn select_both(cap: Option<usize>) {
@@ -140,8 +136,7 @@ fn select_both(cap: Option<usize>) {
                 }
             });
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/crossbeam-deque.rs b/crossbeam-channel/benchmarks/crossbeam-deque.rs
@@ -43,8 +43,7 @@ fn spsc() {
                 }
             }
         });
-    })
-    .unwrap();
+    });
 }
 
 fn main() {

diff --git a/crossbeam-channel/benchmarks/flume.rs b/crossbeam-channel/benchmarks/flume.rs
@@ -75,8 +75,7 @@ fn spsc_unbounded() {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn spsc_bounded(cap: usize) {
@@ -92,8 +91,7 @@ fn spsc_bounded(cap: usize) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc_unbounded() {
@@ -112,8 +110,7 @@ fn mpsc_unbounded() {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn mpsc_bounded(cap: usize) {
@@ -132,8 +129,7 @@ fn mpsc_bounded(cap: usize) {
         for _ in 0..MESSAGES {
             rx.recv().unwrap();
         }
-    })
-    .unwrap();
+    });
 }
 
 fn main() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,8 +43,7 @@ fn spsc() { @@
                     }
                 }
             });
-        })
-        .unwrap();
+        });
     }
     fn main() {
@@ Expand Down @@