From e1048b5ab64cceba5ce8edb1f41614e063edb78d Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Wed, 9 Mar 2016 21:44:35 -0800
Subject: Prefer `Option::expect` over explicit unwrapping.

---
 src/compiletest/errors.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/compiletest/errors.rs')

diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index 44634e4d565..264e32f1d06 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -93,9 +93,8 @@ fn parse_expected(last_nonfollow_error: Option<usize>,
 
     let (which, line) = if follow {
         assert!(adjusts == 0, "use either //~| or //~^, not both.");
-        let line = last_nonfollow_error.unwrap_or_else(|| {
-            panic!("encountered //~| without preceding //~^ line.")
-        });
+        let line = last_nonfollow_error.expect("encountered //~| without \
+                                                preceding //~^ line.");
         (FollowPrevious(line), line)
     } else {
         let which =
-- 
cgit 1.4.1-3-g733a5