diff --git a/src/blob.rs b/src/blob.rs index 9f50980..c24fce9 100644 --- a/src/blob.rs +++ b/src/blob.rs @@ -159,9 +159,8 @@ impl<'conn> io::Read for Blob<'conn> { if n <= 0 { return Ok(0); } - let rc = unsafe { - ffi::sqlite3_blob_read(self.blob, mem::transmute(buf.as_ptr()), n, self.pos) - }; + let rc = + unsafe { ffi::sqlite3_blob_read(self.blob, mem::transmute(buf.as_ptr()), n, self.pos) }; self.conn .decode_result(rc) .map(|_| { @@ -353,7 +352,7 @@ mod test { { // ... but it should've written the first 10 bytes let mut blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, false) - .unwrap(); + .unwrap(); let mut bytes = [0u8; 10]; assert_eq!(10, blob.read(&mut bytes[..]).unwrap()); assert_eq!(b"0123456701", &bytes); @@ -371,7 +370,7 @@ mod test { { // ... but it should've written the first 10 bytes let mut blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, false) - .unwrap(); + .unwrap(); let mut bytes = [0u8; 10]; assert_eq!(10, blob.read(&mut bytes[..]).unwrap()); assert_eq!(b"aaaaaaaaaa", &bytes); diff --git a/src/functions.rs b/src/functions.rs index 8fd78f0..5842880 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -333,7 +333,9 @@ impl<'a> Context<'a> { /// /// `A` is the type of the aggregation context and `T` is the type of the final result. /// Implementations should be stateless. -pub trait Aggregate where T: ToResult { +pub trait Aggregate + where T: ToResult +{ /// Initializes the aggregation context. Will be called prior to the first call /// to `step()` to set up the context for an invocation of the function. (Note: /// `init()` will not be called if the there are no rows.) @@ -769,16 +771,16 @@ mod test { fn test_varargs_function() { let db = Connection::open_in_memory().unwrap(); db.create_scalar_function("my_concat", -1, true, |ctx| { - let mut ret = String::new(); + let mut ret = String::new(); - for idx in 0..ctx.len() { - let s = try!(ctx.get::(idx)); - ret.push_str(&s); - } + for idx in 0..ctx.len() { + let s = try!(ctx.get::(idx)); + ret.push_str(&s); + } - Ok(ret) - }) - .unwrap(); + Ok(ret) + }) + .unwrap(); for &(expected, query) in &[("", "SELECT my_concat()"), ("onetwo", "SELECT my_concat('one', 'two')"), @@ -829,18 +831,18 @@ mod test { // sum should return NULL when given no columns (contrast with count below) let no_result = "SELECT my_sum(i) FROM (SELECT 2 AS i WHERE 1 <> 1)"; let result: Option = db.query_row(no_result, &[], |r| r.get(0)) - .unwrap(); + .unwrap(); assert!(result.is_none()); let single_sum = "SELECT my_sum(i) FROM (SELECT 2 AS i UNION ALL SELECT 2)"; let result: i64 = db.query_row(single_sum, &[], |r| r.get(0)) - .unwrap(); + .unwrap(); assert_eq!(4, result); let dual_sum = "SELECT my_sum(i), my_sum(j) FROM (SELECT 2 AS i, 1 AS j UNION ALL SELECT \ 2, 1)"; let result: (i64, i64) = db.query_row(dual_sum, &[], |r| (r.get(0), r.get(1))) - .unwrap(); + .unwrap(); assert_eq!((4, 2), result); } @@ -856,7 +858,7 @@ mod test { let single_sum = "SELECT my_count(i) FROM (SELECT 2 AS i UNION ALL SELECT 2)"; let result: i64 = db.query_row(single_sum, &[], |r| r.get(0)) - .unwrap(); + .unwrap(); assert_eq!(2, result); } } diff --git a/src/lib.rs b/src/lib.rs index 601ac0c..6dc0f87 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -521,8 +521,8 @@ impl Connection { impl fmt::Debug for Connection { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Connection") - .field("path", &self.path) - .finish() + .field("path", &self.path) + .finish() } } @@ -929,10 +929,10 @@ impl<'conn> fmt::Debug for Statement<'conn> { str::from_utf8(c_slice) }; f.debug_struct("Statement") - .field("conn", self.conn) - .field("stmt", &self.stmt) - .field("sql", &sql) - .finish() + .field("conn", self.conn) + .field("stmt", &self.stmt) + .field("sql", &sql) + .finish() } } @@ -949,7 +949,8 @@ pub struct MappedRows<'stmt, F> { map: F, } -impl<'stmt, T, F> Iterator for MappedRows<'stmt, F> where F: FnMut(&Row) -> T +impl<'stmt, T, F> Iterator for MappedRows<'stmt, F> + where F: FnMut(&Row) -> T { type Item = Result; @@ -974,7 +975,7 @@ impl<'stmt, T, E, F> Iterator for AndThenRows<'stmt, F> fn next(&mut self) -> Option { self.rows.next().map(|row_result| { row_result.map_err(E::from) - .and_then(|row| (self.map)(&row)) + .and_then(|row| (self.map)(&row)) }) } } diff --git a/src/named_params.rs b/src/named_params.rs index 34b3c67..6271142 100644 --- a/src/named_params.rs +++ b/src/named_params.rs @@ -190,10 +190,9 @@ mod test { let mut stmt = db.prepare("INSERT INTO test (x, y) VALUES (:x, :y)").unwrap(); stmt.execute_named(&[(":x", &"one")]).unwrap(); - let result: Option = db.query_row("SELECT y FROM test WHERE x = 'one'", - &[], - |row| row.get(0)) - .unwrap(); + let result: Option = + db.query_row("SELECT y FROM test WHERE x = 'one'", &[], |row| row.get(0)) + .unwrap(); assert!(result.is_none()); } @@ -207,10 +206,9 @@ mod test { stmt.execute_named(&[(":x", &"one")]).unwrap(); stmt.execute_named(&[(":y", &"two")]).unwrap(); - let result: String = db.query_row("SELECT x FROM test WHERE y = 'two'", - &[], - |row| row.get(0)) - .unwrap(); + let result: String = + db.query_row("SELECT x FROM test WHERE y = 'two'", &[], |row| row.get(0)) + .unwrap(); assert_eq!(result, "one"); } } diff --git a/src/types/mod.rs b/src/types/mod.rs index 841242b..58b4dbd 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -379,8 +379,8 @@ mod test { let db = checked_memory_handle(); db.execute("INSERT INTO foo(b, t, i, f) VALUES (X'0102', 'text', 1, 1.5)", - &[]) - .unwrap(); + &[]) + .unwrap(); let mut stmt = db.prepare("SELECT b, t, i, f, n FROM foo").unwrap(); let mut rows = stmt.query(&[]).unwrap(); @@ -442,8 +442,8 @@ mod test { let db = checked_memory_handle(); db.execute("INSERT INTO foo(b, t, i, f) VALUES (X'0102', 'text', 1, 1.5)", - &[]) - .unwrap(); + &[]) + .unwrap(); let mut stmt = db.prepare("SELECT b, t, i, f, n FROM foo").unwrap(); let mut rows = stmt.query(&[]).unwrap();