Merge branch 'master' into basic_tls_support_2

Author: mjgarton

src/commands.rs

@@ -1,6 +1,7 @@
 use crate::myc::constants::{CapabilityFlags, Command as CommandByte};
 
 #[derive(Debug)]
+#[allow(dead_code)] // The fields here are read, but only in tests. This keeps clippy quiet.
 pub struct ClientHandshake<'a> {
     pub capabilities: CapabilityFlags,
     maxps: u32,

src/packet.rs

@@ -124,8 +124,8 @@ impl<R: Read + Write> PacketConn<R> {
             let end = self.bytes.len();
             self.bytes.resize(std::cmp::max(4096, end * 2), 0);
             let read = {
-                let mut buf = &mut self.bytes[end..];
-                self.rw.read(&mut buf)?
+                let buf = &mut self.bytes[end..];
+                self.rw.read(buf)?
             };
             self.bytes.truncate(end + read);
             self.remaining = self.bytes.len();

src/resultset.rs

@@ -79,7 +79,7 @@ impl<'a, W: Read + Write + 'a> StatementMetaWriter<'a, W> {
 
 enum Finalizer {
     Ok { rows: u64, last_insert_id: u64 },
-    EOF,
+    Eof,
 }
 
 /// Convenience type for providing query results to clients.
@@ -127,7 +127,7 @@ impl<'a, W: Read + Write> QueryResultWriter<'a, W> {
                 rows,
                 last_insert_id,
             }) => writers::write_ok_packet(self.writer, rows, last_insert_id, status),
-            Some(Finalizer::EOF) => writers::write_eof_packet(self.writer, status),
+            Some(Finalizer::Eof) => writers::write_eof_packet(self.writer, status),
         }
     }
 
@@ -368,7 +368,7 @@ impl<'a, W: Read + Write + 'a> RowWriter<'a, W> {
                 });
             } else {
                 // we wrote out at least one row
-                self.result.as_mut().unwrap().last_end = Some(Finalizer::EOF);
+                self.result.as_mut().unwrap().last_end = Some(Finalizer::Eof);
             }
         }
 

src/value/decode.rs

@@ -49,11 +49,7 @@ impl<'a> Value<'a> {
 
     /// Returns true if this is a NULL value
     pub fn is_null(&self) -> bool {
-        if let ValueInner::NULL = self.0 {
-            true
-        } else {
-            false
-        }
+        matches!(self.0, ValueInner::NULL)
     }
 
     pub(crate) fn parse_from(
@@ -169,12 +165,12 @@ impl<'a> ValueInner<'a> {
     }
 }
 
-// NOTE: these should all be TryInto
+// NOTE: these should all be TryFrom
 macro_rules! impl_into {
     ($t:ty, $($variant:path),*) => {
-        impl<'a> Into<$t> for Value<'a> {
-            fn into(self) -> $t {
-                match self.0 {
+        impl<'a> From<Value<'a>> for $t {
+            fn from(val: Value<'a>) -> Self {
+                match val.0 {
                     $($variant(v) => v as $t),*,
                     v => panic!(concat!("invalid type conversion from {:?} to ", stringify!($t)), v)
                 }
@@ -195,35 +191,35 @@ impl_into!(f32, ValueInner::Double);
 impl_into!(f64, ValueInner::Double);
 impl_into!(&'a [u8], ValueInner::Bytes);
 
-impl<'a> Into<&'a str> for Value<'a> {
-    fn into(self) -> &'a str {
-        if let ValueInner::Bytes(v) = self.0 {
+impl<'a> From<Value<'a>> for &'a str {
+    fn from(val: Value<'a>) -> Self {
+        if let ValueInner::Bytes(v) = val.0 {
             ::std::str::from_utf8(v).unwrap()
         } else {
-            panic!("invalid type conversion from {:?} to string", self)
+            panic!("invalid type conversion from {:?} to string", val)
         }
     }
 }
 
 use chrono::{NaiveDate, NaiveDateTime};
-impl<'a> Into<NaiveDate> for Value<'a> {
-    fn into(self) -> NaiveDate {
-        if let ValueInner::Date(mut v) = self.0 {
+impl<'a> From<Value<'a>> for NaiveDate {
+    fn from(val: Value<'a>) -> Self {
+        if let ValueInner::Date(mut v) = val.0 {
             assert_eq!(v.len(), 4);
             NaiveDate::from_ymd(
                 i32::from(v.read_u16::<LittleEndian>().unwrap()),
                 u32::from(v.read_u8().unwrap()),
                 u32::from(v.read_u8().unwrap()),
             )
         } else {
-            panic!("invalid type conversion from {:?} to date", self)
+            panic!("invalid type conversion from {:?} to date", val)
         }
     }
 }
 
-impl<'a> Into<NaiveDateTime> for Value<'a> {
-    fn into(self) -> NaiveDateTime {
-        if let ValueInner::Datetime(mut v) = self.0 {
+impl<'a> From<Value<'a>> for NaiveDateTime {
+    fn from(val: Value<'a>) -> Self {
+        if let ValueInner::Datetime(mut v) = val.0 {
             assert!(v.len() == 7 || v.len() == 11);
             let d = NaiveDate::from_ymd(
                 i32::from(v.read_u16::<LittleEndian>().unwrap()),
@@ -242,15 +238,15 @@ impl<'a> Into<NaiveDateTime> for Value<'a> {
                 d.and_hms(h, m, s)
             }
         } else {
-            panic!("invalid type conversion from {:?} to datetime", self)
+            panic!("invalid type conversion from {:?} to datetime", val)
         }
     }
 }
 
 use std::time::Duration;
-impl<'a> Into<Duration> for Value<'a> {
-    fn into(self) -> Duration {
-        if let ValueInner::Time(mut v) = self.0 {
+impl<'a> From<Value<'a>> for Duration {
+    fn from(val: Value<'a>) -> Self {
+        if let ValueInner::Time(mut v) = val.0 {
             assert!(v.is_empty() || v.len() == 8 || v.len() == 12);
 
             if v.is_empty() {
@@ -277,7 +273,7 @@ impl<'a> Into<Duration> for Value<'a> {
                 micros * 1_000,
             )
         } else {
-            panic!("invalid type conversion from {:?} to datetime", self)
+            panic!("invalid type conversion from {:?} to datetime", val)
         }
     }
 }

src/value/encode.rs

@@ -653,11 +653,7 @@ impl ToMysqlValue for myc::value::Value {
     }
 
     fn is_null(&self) -> bool {
-        if let myc::value::Value::NULL = *self {
-            true
-        } else {
-            false
-        }
+        matches!(*self, myc::value::Value::NULL)
     }
 }