From 0d079a05c684f8cea2ab27e782d9fdc09acb334a Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Fri, 19 Jun 2015 13:15:42 -0400 Subject: [PATCH] Use the same name for type parameters --- src/database.rs | 2 +- src/lib.rs | 2 +- src/statement.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/database.rs b/src/database.rs index 38a010c..fa9ed4e 100644 --- a/src/database.rs +++ b/src/database.rs @@ -14,7 +14,7 @@ pub struct Database<'l> { impl<'l> Database<'l> { /// Open a connection to a new or existing database. - pub fn open>(path: P) -> Result> { + pub fn open>(path: T) -> Result> { let mut raw = 0 as *mut _; unsafe { success!(ffi::sqlite3_open_v2(path_to_c_str!(path.as_ref()), &mut raw, diff --git a/src/lib.rs b/src/lib.rs index 5d94e2b..9d7f3c2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -97,7 +97,7 @@ pub type Result = std::result::Result; /// Open a connection to a new or existing database. #[inline] -pub fn open<'l, P: AsRef>(path: P) -> Result> { +pub fn open<'l, T: AsRef>(path: T) -> Result> { Database::open(path) } diff --git a/src/statement.rs b/src/statement.rs index 0ea5fe5..4ef1510 100644 --- a/src/statement.rs +++ b/src/statement.rs @@ -40,7 +40,7 @@ impl<'l> Statement<'l> { /// /// The leftmost location has the index 1. #[inline] - pub fn bind(&mut self, i: usize, parameter: P) -> Result<()> { + pub fn bind(&mut self, i: usize, parameter: T) -> Result<()> { parameter.bind(self, i) } @@ -48,7 +48,7 @@ impl<'l> Statement<'l> { /// /// The leftmost column has the index 0. #[inline] - pub fn read(&self, i: usize) -> Result { + pub fn read(&self, i: usize) -> Result { Value::read(self, i) }