From cb61d53ba59206bbed21d9ed3564555f1f5dcb89 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Tue, 1 Aug 2017 23:42:42 +0200
Subject: [PATCH] Fix error message and shorten code

---
 src/util.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/util.rs b/src/util.rs
index 3d1a4b5..983029e 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -385,11 +385,12 @@ pub unsafe fn pcall_with_traceback(
             ffi::lua_remove(state, -2);
         } else if !is_wrapped_panic(state, 1) {
             let s = ffi::lua_tolstring(state, 1, ptr::null_mut());
-            if !s.is_null() {
-                ffi::luaL_traceback(state, state, s, 0);
+            let s = if s.is_null() {
+                cstr!("<unprintable Rust panic>")
             } else {
-                ffi::luaL_traceback(state, state, cstr!("<unprintable lua error>"), 0);
-            }
+                s
+            };
+            ffi::luaL_traceback(state, state, s, 0);
             ffi::lua_remove(state, -2);
         }
         1