From cbc479c48464551d1df75d227c67c0567ad4675d Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Fri, 20 May 2016 18:36:44 +0200
Subject: [PATCH] Rustfmt

---
 src/error.rs          |  4 +++-
 src/types/mod.rs      |  5 ++++-
 src/vtab/csvtab.rs    | 16 +++++++++-------
 src/vtab/int_array.rs |  5 +++--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 1b0bb50..43f2012 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -109,7 +109,9 @@ impl fmt::Display for Error {
             Error::QueryReturnedNoRows => write!(f, "Query returned no rows"),
             Error::InvalidColumnIndex(i) => write!(f, "Invalid column index: {}", i),
             Error::InvalidColumnName(ref name) => write!(f, "Invalid column name: {}", name),
-            Error::InvalidColumnType(i, t) => write!(f, "Invalid column type {} at index: {}", t, i),
+            Error::InvalidColumnType(i, t) => {
+                write!(f, "Invalid column type {} at index: {}", t, i)
+            }
             Error::StatementChangedRows(i) => write!(f, "Query changed {} rows", i),
             Error::StatementFailedToInsertRow => write!(f, "Statement failed to insert new row"),
 
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 003a431..410bea5 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -88,7 +88,10 @@ pub trait FromSql: Sized {
     }
 }
 
-unsafe fn column_has_expected_typed(stmt: *mut sqlite3_stmt, col: c_int, expected_type: c_int) -> Result<()> {
+unsafe fn column_has_expected_typed(stmt: *mut sqlite3_stmt,
+                                    col: c_int,
+                                    expected_type: c_int)
+                                    -> Result<()> {
     let actual_type = sqlite3_column_type(stmt, col);
     if actual_type == expected_type {
         Ok(())
diff --git a/src/vtab/csvtab.rs b/src/vtab/csvtab.rs
index d220b2c..ee87e19 100644
--- a/src/vtab/csvtab.rs
+++ b/src/vtab/csvtab.rs
@@ -47,8 +47,8 @@ impl CSVTab {
     fn reader(&self) -> result::Result<csv::Reader<File>, csv::Error> {
         csv::Reader::from_file(&self.filename).map(|reader| {
             reader.has_headers(self.has_headers)
-                  .delimiter(self.delimiter)
-                  .quote(self.quote)
+                .delimiter(self.delimiter)
+                .quote(self.quote)
         })
     }
 }
@@ -228,7 +228,7 @@ impl From<csv::Error> for Error {
 
 #[cfg(test)]
 mod test {
-    use {Connection,Result};
+    use {Connection, Result};
     use vtab::csvtab;
 
     #[test]
@@ -244,7 +244,8 @@ mod test {
                 assert_eq!(vec!["rowid", "colA", "colB", "colC"], headers);
             }
 
-            let ids: Result<Vec<i32>> = s.query_map(&[], |row| row.get::<i32, i32>(0)).unwrap().collect();
+            let ids: Result<Vec<i32>> =
+                s.query_map(&[], |row| row.get::<i32, i32>(0)).unwrap().collect();
             let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id);
             assert_eq!(sum, 15);
         }
@@ -258,9 +259,10 @@ mod test {
         db.execute_batch("CREATE VIRTUAL TABLE vtab USING csv('test.csv', HAS_HEADERS)").unwrap();
 
         {
-            let mut s = db.prepare("SELECT v1.rowid, v1.* FROM vtab v1 NATURAL JOIN vtab v2 \
-                                    WHERE v1.rowid < v2.rowid")
-                          .unwrap();
+            let mut s =
+                db.prepare("SELECT v1.rowid, v1.* FROM vtab v1 NATURAL JOIN vtab v2 WHERE \
+                              v1.rowid < v2.rowid")
+                    .unwrap();
 
             let mut rows = s.query(&[]).unwrap();
             let row = rows.next().unwrap().unwrap();
diff --git a/src/vtab/int_array.rs b/src/vtab/int_array.rs
index 07d2109..ea5a224 100644
--- a/src/vtab/int_array.rs
+++ b/src/vtab/int_array.rs
@@ -31,8 +31,9 @@ pub fn drop_int_array(conn: &Connection, name: &str) -> Result<()> {
     conn.execute_batch(&format!("DROP TABLE temp.\"{0}\"", escape_double_quote(name)))
     // http://www.mail-archive.com/sqlite-users%40mailinglists.sqlite.org/msg08423.html
     // "Once a virtual table module has been created, it cannot be modified or destroyed, except by closing the database connection."
-    /*let aux: Option<()> = None;
-    conn.create_module(name, ptr::null() as *const ffi::sqlite3_module, aux)*/
+    // let aux: Option<()> = None;
+    // conn.create_module(name, ptr::null() as *const ffi::sqlite3_module, aux)
+
 }
 
 init_module!(INT_ARRAY_MODULE,