diff --git a/src/functions.rs b/src/functions.rs index ffe5c45..fa1e5f5 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -353,7 +353,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.) diff --git a/src/lib.rs b/src/lib.rs index abd04ec..ec43a82 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -950,7 +950,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; diff --git a/src/vtab/csvtab.rs b/src/vtab/csvtab.rs index 2be7315..4b887aa 100644 --- a/src/vtab/csvtab.rs +++ b/src/vtab/csvtab.rs @@ -18,11 +18,19 @@ pub fn load_module(conn: &Connection) -> Result<()> { conn.create_module("csv", &CSV_MODULE, aux) } -init_module!(CSV_MODULE, CSVTab, CSVTabCursor, - csv_create, csv_best_index, csv_destroy, - csv_open, csv_close, - csv_filter, csv_next, csv_eof, - csv_column, csv_rowid); +init_module!(CSV_MODULE, + CSVTab, + CSVTabCursor, + csv_create, + csv_best_index, + csv_destroy, + csv_open, + csv_close, + csv_filter, + csv_next, + csv_eof, + csv_column, + csv_rowid); #[repr(C)] struct CSVTab { diff --git a/src/vtab/int_array.rs b/src/vtab/int_array.rs index ef1f6d2..3a52971 100644 --- a/src/vtab/int_array.rs +++ b/src/vtab/int_array.rs @@ -29,11 +29,19 @@ pub fn drop_int_array(conn: &Connection, name: &str) -> Result<()> { conn.execute_batch(&format!("DROP TABLE temp.\"{0}\"", escape_double_quote(name))) } -init_module!(INT_ARRAY_MODULE, IntArrayVTab, IntArrayVTabCursor, - int_array_create, int_array_best_index, int_array_destroy, - int_array_open, int_array_close, - int_array_filter, int_array_next, int_array_eof, - int_array_column, int_array_rowid); +init_module!(INT_ARRAY_MODULE, + IntArrayVTab, + IntArrayVTabCursor, + int_array_create, + int_array_best_index, + int_array_destroy, + int_array_open, + int_array_close, + int_array_filter, + int_array_next, + int_array_eof, + int_array_column, + int_array_rowid); #[repr(C)] struct IntArrayVTab {