Auto merge of rust-lang#34452 - frewsxcv:unwrap-or, r=alexcrichton

Use `Option::expect` instead of `unwrap_or_else` with `panic!`. None
jseyfried · Jun 25, 2016 · 35004b4 · 35004b4
2 parents c128e9b + 0a6ce30
commit 35004b4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
@@ -482,9 +482,9 @@ pub struct Thread {
 impl Thread {
     // Used only internally to construct a thread object without spawning
     fn new(name: Option<String>) -> Thread {
-        let cname = name.map(|n| CString::new(n).unwrap_or_else(|_| {
-            panic!("thread name may not contain interior null bytes")
-        }));
+        let cname = name.map(|n| {
+            CString::new(n).expect("thread name may not contain interior null bytes")
+        });
         Thread {
             inner: Arc::new(Inner {
                 name: cname,