From 71aa41c27a0f84eb31c7c058ec4008b4cc17d823 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Thu, 19 May 2016 20:04:33 -0500 Subject: [PATCH] rustfmt --- src/lib.rs | 4 +--- src/named_params.rs | 25 ++++++++++++++----------- src/transaction.rs | 9 +++++++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c3b565e..911667f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -965,9 +965,7 @@ pub struct Rows<'stmt> { impl<'stmt> Rows<'stmt> { fn new(stmt: &'stmt Statement<'stmt>) -> Rows<'stmt> { - Rows { - stmt: Some(stmt), - } + Rows { stmt: Some(stmt) } } fn get_expected_row<'a>(&'a mut self) -> Result> { diff --git a/src/named_params.rs b/src/named_params.rs index 04ebcbd..d89cc6e 100644 --- a/src/named_params.rs +++ b/src/named_params.rs @@ -279,9 +279,10 @@ mod test { let mut stmt = db.prepare("SELECT id FROM test where name = :name").unwrap(); let mut rows = stmt.query_map_named(&[(":name", &"one")], |row| { - let id: i32 = row.get(0); - 2 * id - }).unwrap(); + let id: i32 = row.get(0); + 2 * id + }) + .unwrap(); let doubled_id: i32 = rows.next().unwrap().unwrap(); assert_eq!(2, doubled_id); @@ -298,15 +299,17 @@ mod test { "#; db.execute_batch(sql).unwrap(); - let mut stmt = db.prepare("SELECT id FROM test where name = :name ORDER BY id ASC").unwrap(); + let mut stmt = db.prepare("SELECT id FROM test where name = :name ORDER BY id ASC") + .unwrap(); let mut rows = stmt.query_and_then_named(&[(":name", &"one")], |row| { - let id: i32 = row.get(0); - if id == 1 { - Ok(id) - } else { - Err(Error::SqliteSingleThreadedMode) - } - }).unwrap(); + let id: i32 = row.get(0); + if id == 1 { + Ok(id) + } else { + Err(Error::SqliteSingleThreadedMode) + } + }) + .unwrap(); // first row should be Ok let doubled_id: i32 = rows.next().unwrap().unwrap(); diff --git a/src/transaction.rs b/src/transaction.rs index 3bdae80..e678215 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -209,7 +209,10 @@ impl<'conn> Drop for Transaction<'conn> { } impl<'conn> Savepoint<'conn> { - fn with_depth_and_name>(conn: &Connection, depth: u32, name: T) -> Result { + fn with_depth_and_name>(conn: &Connection, + depth: u32, + name: T) + -> Result { let name = name.into(); conn.execute_batch(&format!("SAVEPOINT {}", name)).map(|_| { Savepoint { @@ -349,7 +352,9 @@ impl Connection { /// # Failure /// /// Will return `Err` if the underlying SQLite call fails. - pub fn transaction_with_behavior(&mut self, behavior: TransactionBehavior) -> Result { + pub fn transaction_with_behavior(&mut self, + behavior: TransactionBehavior) + -> Result { Transaction::new(self, behavior) }