From 9ce913343c097ccf989cb52fa0fbbd17879ef59e Mon Sep 17 00:00:00 2001
From: Ivan Ukhov <ivan.ukhov@gmail.com>
Date: Sat, 6 Oct 2018 10:29:03 +0200
Subject: [PATCH] Adjust the assertions in name

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

diff --git a/src/statement.rs b/src/statement.rs
index 01d11f0..9c72e30 100644
--- a/src/statement.rs
+++ b/src/statement.rs
@@ -72,16 +72,11 @@ impl<'l> Statement<'l> {
     /// Return the name of a column.
     #[inline]
     pub fn name(&self, i: usize) -> &str {
-        debug_assert!(
-            i < self.count(),
-            format!(
-                "column position has to be between 0 and {}",
-                self.count() - 1
-            )
-        );
+        debug_assert!(i < self.count(), "the index is out of range");
         unsafe {
-            let ret = ffi::sqlite3_column_name(self.raw.0, i as c_int);
-            c_str_to_str!(ret).unwrap()
+            let pointer = ffi::sqlite3_column_name(self.raw.0, i as c_int);
+            debug_assert!(!pointer.is_null());
+            c_str_to_str!(pointer).unwrap()
         }
     }