Skip to content

Commit 3832c53

Browse files
committed
Fix clippy warnings
1 parent da6ad2b commit 3832c53

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

codegen/src/sqlstate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ fn make_enum(codes: &[Code], file: &mut BufWriter<File>) {
8383
write!(file,
8484
r#"/// SQLSTATE error codes
8585
#[derive(PartialEq, Eq, Clone, Debug)]
86+
#[allow(enum_variant_names)]
8687
pub enum SqlState {{
8788
"#
8889
).unwrap();

src/error/sqlstate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use phf;
33

44
/// SQLSTATE error codes
55
#[derive(PartialEq, Eq, Clone, Debug)]
6+
#[allow(enum_variant_names)]
67
pub enum SqlState {
78
/// `00000`
89
SuccessfulCompletion,

src/lib.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
//! ```
4141
#![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.11.11")]
4242
#![warn(missing_docs)]
43-
#![allow(unknown_lints, needless_lifetimes)] // for clippy
43+
#![allow(unknown_lints, needless_lifetimes, doc_markdown)] // for clippy
4444

4545
extern crate bufstream;
4646
extern crate byteorder;
@@ -510,7 +510,7 @@ impl InnerConnection {
510510
let info = SessionInfo::new(&self.parameters);
511511
let r = self.stream.write_message(|buf| {
512512
frontend::bind(portal_name,
513-
&stmt_name,
513+
stmt_name,
514514
Some(1),
515515
params.iter().zip(param_types),
516516
|(param, ty), buf| {
@@ -654,27 +654,27 @@ impl InnerConnection {
654654

655655
let (name, type_, elem_oid, rngsubtype, basetype, schema, relid) = {
656656
let ctx = SessionInfo::new(&self.parameters);
657-
let name = try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx)
657+
let name = try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx)
658658
.map_err(Error::Conversion));
659-
let type_ = try!(i8::from_sql(&Type::Char, &mut &**row[1].as_ref().unwrap(), &ctx)
659+
let type_ = try!(i8::from_sql(&Type::Char, row[1].as_ref().unwrap(), &ctx)
660660
.map_err(Error::Conversion));
661-
let elem_oid = try!(Oid::from_sql(&Type::Oid, &mut &**row[2].as_ref().unwrap(), &ctx)
661+
let elem_oid = try!(Oid::from_sql(&Type::Oid, row[2].as_ref().unwrap(), &ctx)
662662
.map_err(Error::Conversion));
663663
let rngsubtype = match row[3] {
664664
Some(ref data) => {
665-
try!(Option::<Oid>::from_sql(&Type::Oid, &mut &**data, &ctx)
665+
try!(Option::<Oid>::from_sql(&Type::Oid, data, &ctx)
666666
.map_err(Error::Conversion))
667667
}
668668
None => {
669669
try!(Option::<Oid>::from_sql_null(&Type::Oid, &ctx).map_err(Error::Conversion))
670670
}
671671
};
672-
let basetype = try!(Oid::from_sql(&Type::Oid, &mut &**row[4].as_ref().unwrap(), &ctx)
672+
let basetype = try!(Oid::from_sql(&Type::Oid, row[4].as_ref().unwrap(), &ctx)
673673
.map_err(Error::Conversion));
674674
let schema =
675-
try!(String::from_sql(&Type::Name, &mut &**row[5].as_ref().unwrap(), &ctx)
675+
try!(String::from_sql(&Type::Name, row[5].as_ref().unwrap(), &ctx)
676676
.map_err(Error::Conversion));
677-
let relid = try!(Oid::from_sql(&Type::Oid, &mut &**row[6].as_ref().unwrap(), &ctx)
677+
let relid = try!(Oid::from_sql(&Type::Oid, row[6].as_ref().unwrap(), &ctx)
678678
.map_err(Error::Conversion));
679679
(name, type_, elem_oid, rngsubtype, basetype, schema, relid)
680680
};
@@ -734,7 +734,7 @@ impl InnerConnection {
734734
let ctx = SessionInfo::new(&self.parameters);
735735
let mut variants = vec![];
736736
for row in rows {
737-
variants.push(try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx)
737+
variants.push(try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx)
738738
.map_err(Error::Conversion)));
739739
}
740740

@@ -769,9 +769,9 @@ impl InnerConnection {
769769
let (name, type_) = {
770770
let ctx = SessionInfo::new(&self.parameters);
771771
let name =
772-
try!(String::from_sql(&Type::Name, &mut &**row[0].as_ref().unwrap(), &ctx)
772+
try!(String::from_sql(&Type::Name, row[0].as_ref().unwrap(), &ctx)
773773
.map_err(Error::Conversion));
774-
let type_ = try!(Oid::from_sql(&Type::Oid, &mut &**row[1].as_ref().unwrap(), &ctx)
774+
let type_ = try!(Oid::from_sql(&Type::Oid, row[1].as_ref().unwrap(), &ctx)
775775
.map_err(Error::Conversion));
776776
(name, type_)
777777
};

src/rows.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ impl<'a> Row<'a> {
239239
let conn = self.stmt.conn().conn.borrow();
240240
let value = match self.data[idx] {
241241
Some(ref data) => {
242-
FromSql::from_sql(ty, &mut &**data, &SessionInfo::new(&conn.parameters))
242+
FromSql::from_sql(ty, data, &SessionInfo::new(&conn.parameters))
243243
}
244244
None => FromSql::from_sql_null(ty, &SessionInfo::new(&conn.parameters)),
245245
};

src/types/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ impl<T: FromSql> FromSql for Vec<T> {
365365
array.values()
366366
.and_then(|v| {
367367
match v {
368-
Some(v) => T::from_sql(&member_type, v, info),
369-
None => T::from_sql_null(&member_type, info),
368+
Some(v) => T::from_sql(member_type, v, info),
369+
None => T::from_sql_null(member_type, info),
370370
}
371371
})
372372
.collect()

0 commit comments

Comments
 (0)