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

Use shared error type

Browse Source
This commit is contained in:
Steven Fackler 2016-12-20 16:10:53 -08:00
parent 3b8fc56296
commit 5d5caac57b
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
postgres-tokio/src/lib.rs
View File

@ -9,14 +9,19 @@ extern crate futures;
use futures::{Future, IntoFuture, BoxFuture, Stream, Sink, Poll, StartSend}; use futures::{Future, IntoFuture, BoxFuture, Stream, Sink, Poll, StartSend};
use futures::future::Either; use futures::future::Either;
use postgres_shared::params::{ConnectParams, IntoConnectParams};
use postgres_protocol::authentication; use postgres_protocol::authentication;
use postgres_protocol::message::{backend, frontend}; use postgres_protocol::message::{backend, frontend};
use std::collections::HashMap; use std::collections::HashMap;
use std::error::Error;
use std::io; use std::io;
use tokio_core::reactor::Handle; use tokio_core::reactor::Handle;
#[doc(inline)]
pub use postgres_shared::error;
#[doc(inline)]
pub use postgres_shared::params;
use error::ConnectError;
use params::{ConnectParams, IntoConnectParams};
use stream::PostgresStream; use stream::PostgresStream;
mod stream; mod stream;
@ -24,24 +29,12 @@ mod stream;
#[cfg(test)] #[cfg(test)]
mod test; mod test;
#[derive(Debug)]
pub enum ConnectError {
Params(Box<Error + Sync + Send>),
Io(io::Error),
}
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub struct CancelData { pub struct CancelData {
pub process_id: i32, pub process_id: i32,
pub secret_key: i32, pub secret_key: i32,
} }
impl From<io::Error> for ConnectError {
fn from(e: io::Error) -> ConnectError {
ConnectError::Io(e)
}
}
struct InnerConnectionState { struct InnerConnectionState {
parameters: HashMap<String, String>, parameters: HashMap<String, String>,
cancel_data: CancelData, cancel_data: CancelData,
@ -116,7 +109,7 @@ impl Connection {
{ {
let params = match params.into_connect_params() { let params = match params.into_connect_params() {
Ok(params) => params, Ok(params) => params,
Err(e) => return futures::failed(ConnectError::Params(e)).boxed(), Err(e) => return futures::failed(ConnectError::ConnectParams(e)).boxed(),
}; };
stream::connect(params.host(), params.port(), handle) stream::connect(params.host(), params.port(), handle)
@ -175,7 +168,7 @@ impl Connection {
.map_err(Into::into) .map_err(Into::into)
} }
None => { None => {
Err(ConnectError::Params( Err(ConnectError::ConnectParams(
"password was required but not provided".into())) "password was required but not provided".into()))
} }
} }
@ -192,7 +185,7 @@ impl Connection {
.map_err(Into::into) .map_err(Into::into)
} }
None => { None => {
Err(ConnectError::Params( Err(ConnectError::ConnectParams(
"password was required but not provided".into())) "password was required but not provided".into()))
} }
} }