From 4c4578851b836fcd7a6768d1e9fbf318b41c8e7f Mon Sep 17 00:00:00 2001 From: gwenn Date: Sat, 2 Feb 2019 11:08:04 +0100 Subject: [PATCH] Remove needless lifetimes --- src/cache.rs | 2 +- src/context.rs | 2 +- src/lib.rs | 2 +- src/session.rs | 2 +- src/statement.rs | 10 +++------- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/cache.rs b/src/cache.rs index 8dc3912..da128a8 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -33,7 +33,7 @@ impl Connection { /// /// Will return `Err` if `sql` cannot be converted to a C-compatible string /// or if the underlying SQLite call fails. - pub fn prepare_cached<'a>(&'a self, sql: &str) -> Result> { + pub fn prepare_cached(&self, sql: &str) -> Result> { self.cache.get(self, sql) } diff --git a/src/context.rs b/src/context.rs index 71a5218..a7bb468 100644 --- a/src/context.rs +++ b/src/context.rs @@ -12,7 +12,7 @@ use crate::types::{ToSqlOutput, ValueRef}; #[cfg(feature = "array")] use crate::vtab::array::{free_array, ARRAY_TYPE}; -pub(crate) unsafe fn set_result<'a>(ctx: *mut sqlite3_context, result: &ToSqlOutput<'a>) { +pub(crate) unsafe fn set_result(ctx: *mut sqlite3_context, result: &ToSqlOutput<'_>) { let value = match *result { ToSqlOutput::Borrowed(v) => v, ToSqlOutput::Owned(ref v) => ValueRef::from(v), diff --git a/src/lib.rs b/src/lib.rs index ac61236..1cc4a1d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -567,7 +567,7 @@ impl Connection { /// /// Will return `Err` if `sql` cannot be converted to a C-compatible string /// or if the underlying SQLite call fails. - pub fn prepare<'a>(&'a self, sql: &str) -> Result> { + pub fn prepare(&self, sql: &str) -> Result> { self.db.borrow_mut().prepare(self, sql) } diff --git a/src/session.rs b/src/session.rs index 2fad29a..06ad8a7 100644 --- a/src/session.rs +++ b/src/session.rs @@ -258,7 +258,7 @@ impl Changeset { } /// Create an iterator to traverse a changeset - pub fn iter<'changeset>(&'changeset self) -> Result> { + pub fn iter(&self) -> Result> { let mut it: *mut ffi::sqlite3_changeset_iter = unsafe { mem::uninitialized() }; check!(unsafe { ffi::sqlite3changeset_start(&mut it, self.n, self.cs) }); Ok(ChangesetIter { diff --git a/src/statement.rs b/src/statement.rs index 439a9e9..1d22d52 100644 --- a/src/statement.rs +++ b/src/statement.rs @@ -186,7 +186,7 @@ impl<'conn> Statement<'conn> { /// ## Failure /// /// Will return `Err` if binding parameters fails. - pub fn query<'a, P>(&'a mut self, params: P) -> Result> + pub fn query

(&mut self, params: P) -> Result> where P: IntoIterator, P::Item: ToSql, @@ -263,7 +263,7 @@ impl<'conn> Statement<'conn> { /// ## Failure /// /// Will return `Err` if binding parameters fails. - pub fn query_map<'a, T, P, F>(&'a mut self, params: P, f: F) -> Result> + pub fn query_map(&mut self, params: P, f: F) -> Result> where P: IntoIterator, P::Item: ToSql, @@ -319,11 +319,7 @@ impl<'conn> Statement<'conn> { /// # Failure /// /// Will return `Err` if binding parameters fails. - pub fn query_and_then<'a, T, E, P, F>( - &'a mut self, - params: P, - f: F, - ) -> Result> + pub fn query_and_then(&mut self, params: P, f: F) -> Result> where P: IntoIterator, P::Item: ToSql,