ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-10-23 23:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove potentially conflicting impl of ToSqlOutput.

Browse Source 
Replace with manual implementations of all the types we provided impls
for before.
This commit is contained in:
John Gallagher 2017-12-05 19:40:09 -05:00
parent 402d5340d5
commit aa64e2fb33
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/types/to_sql.rs
View File

@ -15,6 +15,8 @@ pub enum ToSqlOutput<'a> {
ZeroBlob(i32), ZeroBlob(i32),
} }
// Generically allow any type that can be converted into a ValueRef
// to be converted into a ToSqlOutput as well.
impl<'a, T: ?Sized> From<&'a T> for ToSqlOutput<'a> impl<'a, T: ?Sized> From<&'a T> for ToSqlOutput<'a>
where &'a T: Into<ValueRef<'a>> where &'a T: Into<ValueRef<'a>>
{ {
@ -23,11 +25,31 @@ impl<'a, T: ?Sized> From<&'a T> for ToSqlOutput<'a>
} }
} }
impl<'a, T: Into<Value>> From<T> for ToSqlOutput<'a> { // We cannot also generically allow any type that can be converted
fn from(t: T) -> Self { // into a Value to be converted into a ToSqlOutput because of
ToSqlOutput::Owned(t.into()) // coherence rules (https://github.com/rust-lang/rust/pull/46192),
// so we'll manually implement it for all the types we know can
// be converted into Values.
macro_rules! from_value(
($t:ty) => (
impl<'a> From<$t> for ToSqlOutput<'a> {
fn from(t: $t) -> Self { ToSqlOutput::Owned(t.into())}
} }
} )
);
from_value!(String);
from_value!(Null);
from_value!(bool);
from_value!(i8);
from_value!(i16);
from_value!(i32);
from_value!(i64);
from_value!(isize);
from_value!(u8);
from_value!(u16);
from_value!(u32);
from_value!(f64);
from_value!(Vec<u8>);
impl<'a> ToSql for ToSqlOutput<'a> { impl<'a> ToSql for ToSqlOutput<'a> {
fn to_sql(&self) -> Result<ToSqlOutput> { fn to_sql(&self) -> Result<ToSqlOutput> {