diff --git a/codegen/src/sqlstate.rs b/codegen/src/sqlstate.rs index eaad7015..07194216 100644 --- a/codegen/src/sqlstate.rs +++ b/codegen/src/sqlstate.rs @@ -83,6 +83,7 @@ fn make_enum(codes: &[Code], file: &mut BufWriter) { write!(file, r#"/// SQLSTATE error codes #[derive(PartialEq, Eq, Clone, Debug)] +#[allow(enum_variant_names)] pub enum SqlState {{ "# ).unwrap(); diff --git a/src/error/sqlstate.rs b/src/error/sqlstate.rs index e7b5c292..12590048 100644 --- a/src/error/sqlstate.rs +++ b/src/error/sqlstate.rs @@ -3,6 +3,7 @@ use phf; /// SQLSTATE error codes #[derive(PartialEq, Eq, Clone, Debug)] +#[allow(enum_variant_names)] pub enum SqlState { /// `00000` SuccessfulCompletion, diff --git a/src/lib.rs b/src/lib.rs index 2ed852e9..17fcd739 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,7 +40,7 @@ //! ``` #![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.11.11")] #![warn(missing_docs)] -#![allow(unknown_lints, needless_lifetimes)] // for clippy +#![allow(unknown_lints, needless_lifetimes, doc_markdown)] // for clippy extern crate bufstream; extern crate byteorder; @@ -510,7 +510,7 @@ impl InnerConnection { let info = SessionInfo::new(&self.parameters); let r = self.stream.write_message(|buf| { frontend::bind(portal_name, - &stmt_name, + stmt_name, Some(1), params.iter().zip(param_types), |(param, ty), buf| { @@ -654,27 +654,27 @@ impl InnerConnection { let (name, type_, elem_oid, rngsubtype, basetype, schema, relid) = { let ctx = SessionInfo::new(&self.parameters); - let name = try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx) + let name = try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); - let type_ = try!(i8::from_sql(&Type::Char, &mut &**row[1].as_ref().unwrap(), &ctx) + let type_ = try!(i8::from_sql(&Type::Char, row[1].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); - let elem_oid = try!(Oid::from_sql(&Type::Oid, &mut &**row[2].as_ref().unwrap(), &ctx) + let elem_oid = try!(Oid::from_sql(&Type::Oid, row[2].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); let rngsubtype = match row[3] { Some(ref data) => { - try!(Option::::from_sql(&Type::Oid, &mut &**data, &ctx) + try!(Option::::from_sql(&Type::Oid, data, &ctx) .map_err(Error::Conversion)) } None => { try!(Option::::from_sql_null(&Type::Oid, &ctx).map_err(Error::Conversion)) } }; - let basetype = try!(Oid::from_sql(&Type::Oid, &mut &**row[4].as_ref().unwrap(), &ctx) + let basetype = try!(Oid::from_sql(&Type::Oid, row[4].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); let schema = - try!(String::from_sql(&Type::Name, &mut &**row[5].as_ref().unwrap(), &ctx) + try!(String::from_sql(&Type::Name, row[5].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); - let relid = try!(Oid::from_sql(&Type::Oid, &mut &**row[6].as_ref().unwrap(), &ctx) + let relid = try!(Oid::from_sql(&Type::Oid, row[6].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); (name, type_, elem_oid, rngsubtype, basetype, schema, relid) }; @@ -734,7 +734,7 @@ impl InnerConnection { let ctx = SessionInfo::new(&self.parameters); let mut variants = vec![]; for row in rows { - variants.push(try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx) + variants.push(try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx) .map_err(Error::Conversion))); } @@ -769,9 +769,9 @@ impl InnerConnection { let (name, type_) = { let ctx = SessionInfo::new(&self.parameters); let name = - try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx) + try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); - let type_ = try!(Oid::from_sql(&Type::Oid, &mut &**row[1].as_ref().unwrap(), &ctx) + let type_ = try!(Oid::from_sql(&Type::Oid, row[1].as_ref().unwrap(), &ctx) .map_err(Error::Conversion)); (name, type_) }; diff --git a/src/rows.rs b/src/rows.rs index 34056ee8..de3769ba 100644 --- a/src/rows.rs +++ b/src/rows.rs @@ -239,7 +239,7 @@ impl<'a> Row<'a> { let conn = self.stmt.conn().conn.borrow(); let value = match self.data[idx] { Some(ref data) => { - FromSql::from_sql(ty, &mut &**data, &SessionInfo::new(&conn.parameters)) + FromSql::from_sql(ty, data, &SessionInfo::new(&conn.parameters)) } None => FromSql::from_sql_null(ty, &SessionInfo::new(&conn.parameters)), }; diff --git a/src/types/mod.rs b/src/types/mod.rs index ba1082a6..a2c989b2 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -365,8 +365,8 @@ impl FromSql for Vec { array.values() .and_then(|v| { match v { - Some(v) => T::from_sql(&member_type, v, info), - None => T::from_sql_null(&member_type, info), + Some(v) => T::from_sql(member_type, v, info), + None => T::from_sql_null(member_type, info), } }) .collect()