Merge branch 'clippy_fixes' into basic_tls_support_2

Author: mjgarton

examples/psql_as_mysql.rs

@@ -139,7 +139,7 @@ impl<W: io::Read + io::Write> MysqlShim<W> for Postgres {
                 use std::mem;
                 let params: Vec<_> = stmt
                     .params()
-                    .into_iter()
+                    .iter()
                     .map(|t| {
                         let ct = p2mt(t);
                         Column {
@@ -152,7 +152,7 @@ impl<W: io::Read + io::Write> MysqlShim<W> for Postgres {
                     .collect();
                 let columns: Vec<_> = stmt
                     .columns()
-                    .into_iter()
+                    .iter()
                     .map(|c| {
                         let t = c.type_();
                         let ct = p2mt(t);
@@ -268,10 +268,10 @@ fn answer_rows<W: io::Read + io::Write>(
 ) -> Result<(), Error> {
     match rows {
         Ok(rows) => {
-            if let Some(first) = rows.iter().next() {
+            if let Some(first) = rows.get(0) {
                 let cols: Vec<_> = first
                     .columns()
-                    .into_iter()
+                    .iter()
                     .map(|c| {
                         let t = c.type_();
                         let ct = p2mt(t);

src/lib.rs

@@ -378,7 +378,7 @@ impl<B: MysqlShim<RW>, RW: Read + Write> MysqlIntermediary<B, RW> {
                         let schema = ::std::str::from_utf8(&q[b"USE ".len()..])
                             .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
                         let schema = schema.trim().trim_end_matches(';').trim_matches('`');
-                        self.shim.on_init(&schema, w)?;
+                        self.shim.on_init(schema, w)?;
                     } else {
                         let w = QueryResultWriter::new(&mut self.rw, false);
                         self.shim.on_query(

src/value/decode.rs

@@ -251,9 +251,9 @@ use std::time::Duration;
 impl<'a> Into<Duration> for Value<'a> {
     fn into(self) -> Duration {
         if let ValueInner::Time(mut v) = self.0 {
-            assert!(v.len() == 0 || v.len() == 8 || v.len() == 12);
+            assert!(v.is_empty() || v.len() == 8 || v.len() == 12);
 
-            if v.len() == 0 {
+            if v.is_empty() {
                 return Duration::from_secs(0);
             }
 

tests/async.rs

@@ -103,7 +103,7 @@ where
         });
 
         tokio::runtime::current_thread::block_on_all(
-            mysql_async::Conn::new(format!("mysql://127.0.0.1:{}", port)).and_then(|conn| c(conn)),
+            mysql_async::Conn::new(format!("mysql://127.0.0.1:{}", port)).and_then(c),
         )
         .unwrap();
 
@@ -664,7 +664,7 @@ fn prepared_empty() {
         coltype: myc::constants::ColumnType::MYSQL_TYPE_SHORT,
         colflags: myc::constants::ColumnFlags::empty(),
     }];
-    let cols2 = cols.clone();
+    let cols2 = cols;
     let params = vec![Column {
         table: String::new(),
         column: "c".to_owned(),

tests/main.rs

@@ -136,7 +136,7 @@ where
 
     fn test<C>(self, c: C)
     where
-        C: FnOnce(&mut mysql::Conn) -> (),
+        C: FnOnce(&mut mysql::Conn),
     {
         self.test_with_result(c).unwrap()
     }
@@ -854,7 +854,7 @@ fn prepared_empty() {
         coltype: myc::constants::ColumnType::MYSQL_TYPE_SHORT,
         colflags: myc::constants::ColumnFlags::empty(),
     }];
-    let cols2 = cols.clone();
+    let cols2 = cols;
     let params = vec![Column {
         table: String::new(),
         column: "c".to_owned(),