Prefer Option::expect over explicit unwrapping.

2016-03-09 21:44:35 -08:00 · 2016-03-09 21:44:35 -08:00 · e1048b5ab6
commit e1048b5ab6
parent 0b9995b24c
1 changed files with 2 additions and 3 deletions
--- 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 =