diff --git a/codegen/src/sqlstate.rs b/codegen/src/sqlstate.rs index 298022b8..096a872c 100644 --- a/codegen/src/sqlstate.rs +++ b/codegen/src/sqlstate.rs @@ -96,14 +96,16 @@ pub enum SqlState {{ write!(file, " /// An unknown code - Other(String) + Other(String), }} " ).unwrap(); } fn make_map(codes: &[Code], file: &mut BufWriter) { - write!(file, "static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ").unwrap(); + write!(file, +"#[cfg_attr(rustfmt, rustfmt_skip)] +static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ").unwrap(); let mut builder = phf_codegen::Map::new(); for code in codes { builder.entry(&*code.code, &format!("SqlState::{}", code.variant)); @@ -119,7 +121,7 @@ impl SqlState {{ pub fn from_code(s: String) -> SqlState {{ match SQLSTATE_MAP.get(&*s) {{ Some(state) => state.clone(), - None => SqlState::Other(s) + None => SqlState::Other(s), }} }} diff --git a/src/error/sqlstate.rs b/src/error/sqlstate.rs index 874ea5f4..0063f090 100644 --- a/src/error/sqlstate.rs +++ b/src/error/sqlstate.rs @@ -477,8 +477,9 @@ pub enum SqlState { /// `XX002` IndexCorrupted, /// An unknown code - Other(String) + Other(String), } +#[cfg_attr(rustfmt, rustfmt_skip)] static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ::phf::Map { key: 1897749892740154578, disps: &[ @@ -776,7 +777,7 @@ impl SqlState { pub fn from_code(s: String) -> SqlState { match SQLSTATE_MAP.get(&*s) { Some(state) => state.clone(), - None => SqlState::Other(s) + None => SqlState::Other(s), } } diff --git a/src/lib.rs b/src/lib.rs index 373477c1..9dfafadf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -180,13 +180,7 @@ impl IntoConnectParams for Url { Err("unix socket support requires the `unix_socket` feature".into()) } - let Url { - host, - port, - user, - path: url::Path { mut path, query: options, .. }, - .. - } = self; + let Url { host, port, user, path: url::Path { mut path, query: options, .. }, .. } = self; let maybe_path = try!(url::decode_component(&host)); let target = if maybe_path.starts_with('/') { @@ -711,7 +705,8 @@ impl InnerConnection { } CopyInResponse { .. } => { try!(self.write_messages(&[CopyFail { - message: "COPY queries cannot be directly executed", + message: "COPY queries cannot be directly \ + executed", }, Sync])); } @@ -746,7 +741,9 @@ impl InnerConnection { "expected {} parameters but got {}", param_types.len(), params.len()); - debug!("executing statement {} with parameters: {:?}", stmt_name, params); + debug!("executing statement {} with parameters: {:?}", + stmt_name, + params); let mut values = vec![]; for (param, ty) in params.iter().zip(param_types) { let mut buf = vec![]; @@ -857,28 +854,18 @@ impl InnerConnection { let (name, type_, elem_oid, rngsubtype, basetype, schema, relid) = { let ctx = SessionInfo::new(self); - let name = try!(String::from_sql(&Type::Name, - &mut &**row[0].as_ref().unwrap(), - &ctx)); - let type_ = try!(i8::from_sql(&Type::Char, - &mut &**row[1].as_ref().unwrap(), - &ctx)); - let elem_oid = try!(Oid::from_sql(&Type::Oid, - &mut &**row[2].as_ref().unwrap(), - &ctx)); + let name = try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx)); + let type_ = try!(i8::from_sql(&Type::Char, &mut &**row[1].as_ref().unwrap(), &ctx)); + let elem_oid = try!(Oid::from_sql(&Type::Oid, &mut &**row[2].as_ref().unwrap(), &ctx)); let rngsubtype = match row[3] { Some(ref data) => try!(Option::::from_sql(&Type::Oid, &mut &**data, &ctx)), None => try!(Option::::from_sql_null(&Type::Oid, &ctx)), }; - let basetype = try!(Oid::from_sql(&Type::Oid, - &mut &**row[4].as_ref().unwrap(), - &ctx)); + let basetype = try!(Oid::from_sql(&Type::Oid, &mut &**row[4].as_ref().unwrap(), &ctx)); let schema = try!(String::from_sql(&Type::Name, &mut &**row[5].as_ref().unwrap(), &ctx)); - let relid = try!(Oid::from_sql(&Type::Oid, - &mut &**row[6].as_ref().unwrap(), - &ctx)); + let relid = try!(Oid::from_sql(&Type::Oid, &mut &**row[6].as_ref().unwrap(), &ctx)); (name, type_, elem_oid, rngsubtype, basetype, schema, relid) }; @@ -930,9 +917,7 @@ impl InnerConnection { let name = try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx)); - let type_ = try!(Oid::from_sql(&Type::Oid, - &mut &**row[1].as_ref().unwrap(), - &ctx)); + let type_ = try!(Oid::from_sql(&Type::Oid, &mut &**row[1].as_ref().unwrap(), &ctx)); (name, type_) }; let type_ = try!(self.get_type(type_)); diff --git a/src/rows.rs b/src/rows.rs index 59f85d1a..66b7400c 100644 --- a/src/rows.rs +++ b/src/rows.rs @@ -7,8 +7,8 @@ use std::fmt; use std::ops::Deref; use std::slice; -use {Result, Transaction, DbErrorNew, SessionInfoNew, RowsNew, LazyRowsNew, - StatementInternals, WrongTypeNew}; +use {Result, Transaction, DbErrorNew, SessionInfoNew, RowsNew, LazyRowsNew, StatementInternals, + WrongTypeNew}; use types::{FromSql, SessionInfo, WrongType}; use stmt::{Statement, Column}; use error::Error; diff --git a/src/stmt.rs b/src/stmt.rs index 66c5a945..0735c660 100644 --- a/src/stmt.rs +++ b/src/stmt.rs @@ -85,7 +85,11 @@ impl<'conn> Statement<'conn> { -> Result<(VecDeque>>>, bool)> { let mut conn = self.conn.conn.borrow_mut(); - try!(conn.raw_execute(&self.info.name, portal_name, row_limit, self.param_types(), params)); + try!(conn.raw_execute(&self.info.name, + portal_name, + row_limit, + self.param_types(), + params)); let mut buf = VecDeque::new(); let more_rows = try!(conn.read_rows(&mut buf)); diff --git a/src/url.rs b/src/url.rs index 9785514f..3ff20fa3 100644 --- a/src/url.rs +++ b/src/url.rs @@ -376,7 +376,8 @@ fn get_authority(rawurl: &str) -> DecodeResult<(Option, &str, Option host = &rawurl[begin..end], + State::InHost | + State::Start => host = &rawurl[begin..end], State::InPort => { if input != Input::Digit { return Err("Non-digit characters in port.".to_owned());