dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to work with latest master

Browse Source 
This is segfaulting for me in places that should not segfault. Not sure
what's going on.
This commit is contained in:
Steven Fackler
2013-09-07 11:28:26 -07:00
parent 1b00801938
commit 21ce229fe1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/message.rs
View File

@@ -230,7 +230,7 @@ impl<R: Reader> ReadString for R {
buf.push(byte);
}
str::from_bytes_owned(buf)
str::from_utf8_owned(buf)
}
}

6
src/types.rs
View File

@@ -145,7 +145,7 @@ from_conversions_impl!(PgFloat8, f64, read_be_f64_)
from_option_impl!(f64)
from_map_impl!(PgVarchar | PgText | PgCharN, ~str, |buf| {
str::from_bytes(buf.as_slice())
str::from_utf8(buf.as_slice())
})
from_option_impl!(~str)
@@ -158,12 +158,12 @@ impl FromSql for Option<~[u8]> {
from_option_impl!(~[u8])
from_map_impl!(PgJson, Json, |buf| {
json::from_str(str::from_bytes_slice(buf.as_slice())).unwrap()
json::from_str(str::from_utf8_slice(buf.as_slice())).unwrap()
})
from_option_impl!(Json)
from_map_impl!(PgUuid, Uuid, |buf| {
Uuid::from_bytes(buf.as_slice()).unwrap()
Uuid::from_utf8(buf.as_slice()).unwrap()
})
from_option_impl!(Uuid)