Update for API changes
This commit is contained in:
parent
10e9bfab19
commit
5f65010b1e
3
lib.rs
3
lib.rs
@ -589,7 +589,8 @@ impl InnerPostgresConnection {
|
|||||||
ReadyForQuery { .. } => break,
|
ReadyForQuery { .. } => break,
|
||||||
DataRow { row } =>
|
DataRow { row } =>
|
||||||
result.push(row.move_iter().map(|opt|
|
result.push(row.move_iter().map(|opt|
|
||||||
opt.map(|b| str::from_utf8_owned(b))).collect()),
|
opt.map(|b| str::from_utf8_owned(b).unwrap()))
|
||||||
|
.collect()),
|
||||||
ErrorResponse { fields } =>
|
ErrorResponse { fields } =>
|
||||||
fail!("Error: {}",
|
fail!("Error: {}",
|
||||||
PostgresDbError::new(fields).to_str()),
|
PostgresDbError::new(fields).to_str()),
|
||||||
|
@ -245,7 +245,7 @@ impl<R: Buffer> ReadCStr for R {
|
|||||||
fn read_cstr(&mut self) -> ~str {
|
fn read_cstr(&mut self) -> ~str {
|
||||||
let mut buf = self.read_until(0).unwrap();
|
let mut buf = self.read_until(0).unwrap();
|
||||||
buf.pop();
|
buf.pop();
|
||||||
str::from_utf8_owned(buf)
|
str::from_utf8_owned(buf).unwrap()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
pool.rs
2
pool.rs
@ -87,7 +87,7 @@ impl PostgresConnectionPool {
|
|||||||
cvar.wait();
|
cvar.wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
pool.pool.pop()
|
pool.pool.pop().unwrap()
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -267,7 +267,7 @@ impl RawFromSql for ~[u8] {
|
|||||||
|
|
||||||
impl RawFromSql for ~str {
|
impl RawFromSql for ~str {
|
||||||
fn raw_from_sql<R: Reader>(len: uint, raw: &mut R) -> ~str {
|
fn raw_from_sql<R: Reader>(len: uint, raw: &mut R) -> ~str {
|
||||||
str::from_utf8_owned(raw.read_bytes(len))
|
str::from_utf8_owned(raw.read_bytes(len)).unwrap()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -455,13 +455,13 @@ from_map_impl!(PgUnknownType { name: ~"hstore", .. },
|
|||||||
|
|
||||||
for _ in range(0, count) {
|
for _ in range(0, count) {
|
||||||
let key_len = rdr.read_be_i32();
|
let key_len = rdr.read_be_i32();
|
||||||
let key = str::from_utf8_owned(rdr.read_bytes(key_len as uint));
|
let key = str::from_utf8_owned(rdr.read_bytes(key_len as uint)).unwrap();
|
||||||
|
|
||||||
let val_len = rdr.read_be_i32();
|
let val_len = rdr.read_be_i32();
|
||||||
let val = if val_len < 0 {
|
let val = if val_len < 0 {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(str::from_utf8_owned(rdr.read_bytes(val_len as uint)))
|
Some(str::from_utf8_owned(rdr.read_bytes(val_len as uint)).unwrap())
|
||||||
};
|
};
|
||||||
|
|
||||||
map.insert(key, val);
|
map.insert(key, val);
|
||||||
|
Loading…
Reference in New Issue
Block a user