Merge remote-tracking branch 'jgallagher/master' into vtab

src/lib.rs

@@ -50,6 +50,9 @@
 //!     }
 //! }
 //! ```
+#![cfg_attr(feature="clippy", feature(plugin))]
+#![cfg_attr(feature="clippy", plugin(clippy))]
+
 extern crate libc;
 extern crate libsqlite3_sys as ffi;
 #[macro_use]
@@ -100,7 +103,7 @@ pub type Result<T> = result::Result<T, Error>;
 unsafe fn errmsg_to_string(errmsg: *const c_char) -> String {
     let c_slice = CStr::from_ptr(errmsg).to_bytes();
     let utf8_str = str::from_utf8(c_slice);
-    utf8_str.unwrap_or("Invalid string encoding").to_string()
+    utf8_str.unwrap_or("Invalid string encoding").to_owned()
 }
 
 fn str_to_cstring(s: &str) -> Result<CString> {
@@ -128,9 +131,9 @@ pub enum DatabaseName<'a> {
 // impl to avoid dead code warnings.
 #[cfg(any(feature = "backup", feature = "blob"))]
 impl<'a> DatabaseName<'a> {
-    fn to_cstring(self) -> Result<CString> {
+    fn to_cstring(&self) -> Result<CString> {
         use self::DatabaseName::{Main, Temp, Attached};
-        match self {
+        match *self {
             Main => str_to_cstring("main"),
             Temp => str_to_cstring("temp"),
             Attached(s) => str_to_cstring(s),
@@ -235,7 +238,7 @@ impl Connection {
     /// # Failure
     ///
     /// Will return `Err` if the underlying SQLite call fails.
-    pub fn transaction<'a>(&'a self) -> Result<Transaction<'a>> {
+    pub fn transaction(&self) -> Result<Transaction> {
         Transaction::new(self, TransactionBehavior::Deferred)
     }
 
@@ -246,9 +249,7 @@ impl Connection {
     /// # Failure
     ///
     /// Will return `Err` if the underlying SQLite call fails.
-    pub fn transaction_with_behavior<'a>(&'a self,
-                                         behavior: TransactionBehavior)
-                                         -> Result<Transaction<'a>> {
+    pub fn transaction_with_behavior(&self, behavior: TransactionBehavior) -> Result<Transaction> {
         Transaction::new(self, behavior)
     }
 
@@ -573,11 +574,7 @@ impl InnerConnection {
             // https://github.com/mackyle/sqlite/blob/master/src/mutex_noop.c).
             const SQLITE_SINGLETHREADED_MUTEX_MAGIC: usize = 8;
             let mutex_ptr = ffi::sqlite3_mutex_alloc(0);
-            let is_singlethreaded = if mutex_ptr as usize == SQLITE_SINGLETHREADED_MUTEX_MAGIC {
-                true
-            } else {
-                false
-            };
+            let is_singlethreaded = mutex_ptr as usize == SQLITE_SINGLETHREADED_MUTEX_MAGIC;
             ffi::sqlite3_mutex_free(mutex_ptr);
             if is_singlethreaded {
                 return Err(Error::SqliteSingleThreadedMode);
@@ -795,10 +792,10 @@ impl<'conn> Statement<'conn> {
         ffi::sqlite3_reset(self.stmt);
         match r {
             ffi::SQLITE_DONE => {
-                if self.column_count != 0 {
-                    Err(Error::ExecuteReturnedResults)
-                } else {
+                if self.column_count == 0 {
                     Ok(self.conn.changes())
+                } else {
+                    Err(Error::ExecuteReturnedResults)
                 }
             }
             ffi::SQLITE_ROW => Err(Error::ExecuteReturnedResults),
@@ -1174,9 +1171,9 @@ impl<'a> RowIndex for &'a str {
 
 #[cfg(test)]
 mod test {
-    extern crate libsqlite3_sys as ffi;
     extern crate tempdir;
     pub use super::*;
+    use ffi;
     use self::tempdir::TempDir;
     pub use std::error::Error as StdError;
     pub use std::fmt;
@@ -1225,10 +1222,9 @@ mod test {
 
     #[test]
     fn test_open_with_flags() {
-        for bad_flags in [OpenFlags::empty(),
-                          SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_READ_WRITE,
-                          SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_CREATE]
-                             .iter() {
+        for bad_flags in &[OpenFlags::empty(),
+                           SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_READ_WRITE,
+                           SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_CREATE] {
             assert!(Connection::open_in_memory_with_flags(*bad_flags).is_err());
         }
     }