|
3 | 3 | use std::collections::HashMap; |
4 | 4 | use std::io; |
5 | 5 | use std::fmt; |
| 6 | +use std::result; |
6 | 7 |
|
7 | 8 | use openssl::ssl::error; |
8 | 9 | use phf; |
9 | 10 |
|
10 | | -use PostgresResult; |
| 11 | +use Result; |
11 | 12 | use types::PostgresType; |
12 | 13 |
|
13 | 14 | macro_rules! make_errors( |
@@ -477,7 +478,7 @@ pub struct PostgresDbError { |
477 | 478 |
|
478 | 479 | impl PostgresDbError { |
479 | 480 | #[doc(hidden)] |
480 | | - pub fn new_raw(fields: Vec<(u8, String)>) -> Result<PostgresDbError, ()> { |
| 481 | + pub fn new_raw(fields: Vec<(u8, String)>) -> result::Result<PostgresDbError, ()> { |
481 | 482 | let mut map: HashMap<_, _> = fields.into_iter().collect(); |
482 | 483 | Ok(PostgresDbError { |
483 | 484 | severity: try!(map.pop(&b'S').ok_or(())), |
@@ -508,15 +509,15 @@ impl PostgresDbError { |
508 | 509 | } |
509 | 510 |
|
510 | 511 | #[doc(hidden)] |
511 | | - pub fn new_connect<T>(fields: Vec<(u8, String)>) -> Result<T, PostgresConnectError> { |
| 512 | + pub fn new_connect<T>(fields: Vec<(u8, String)>) -> result::Result<T, PostgresConnectError> { |
512 | 513 | match PostgresDbError::new_raw(fields) { |
513 | 514 | Ok(err) => Err(PgConnectDbError(err)), |
514 | 515 | Err(()) => Err(PgConnectBadResponse), |
515 | 516 | } |
516 | 517 | } |
517 | 518 |
|
518 | 519 | #[doc(hidden)] |
519 | | - pub fn new<T>(fields: Vec<(u8, String)>) -> PostgresResult<T> { |
| 520 | + pub fn new<T>(fields: Vec<(u8, String)>) -> Result<T> { |
520 | 521 | match PostgresDbError::new_raw(fields) { |
521 | 522 | Ok(err) => Err(PgDbError(err)), |
522 | 523 | Err(()) => Err(PgBadData), |
|
0 commit comments