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

Fix clippy warnings

Browse Source
This commit is contained in:
Steven Fackler 2016-09-24 14:35:21 -07:00
parent da6ad2b821
commit 3832c53deb
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codegen/src/sqlstate.rs
View File

@ -83,6 +83,7 @@ fn make_enum(codes: &[Code], file: &mut BufWriter<File>) {
write!(file,
r#"/// SQLSTATE error codes
#[derive(PartialEq, Eq, Clone, Debug)]
#[allow(enum_variant_names)]
pub enum SqlState {{
"#
).unwrap();

1
src/error/sqlstate.rs
View File

@ -3,6 +3,7 @@ use phf;
/// SQLSTATE error codes
#[derive(PartialEq, Eq, Clone, Debug)]
#[allow(enum_variant_names)]
pub enum SqlState {
/// `00000`
SuccessfulCompletion,

24
src/lib.rs
View File

@ -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::<Oid>::from_sql(&Type::Oid, &mut &**data, &ctx)
try!(Option::<Oid>::from_sql(&Type::Oid, data, &ctx)
.map_err(Error::Conversion))
}
None => {
try!(Option::<Oid>::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_)
};

2
src/rows.rs
View File

@ -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)),
};

4
src/types/mod.rs
View File

@ -365,8 +365,8 @@ impl<T: FromSql> FromSql for Vec<T> {
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()