diff --git a/src/connector/mssql/conversion.rs b/src/connector/mssql/conversion.rs index 76b66fc54..f53ee79e9 100644 --- a/src/connector/mssql/conversion.rs +++ b/src/connector/mssql/conversion.rs @@ -17,7 +17,7 @@ pub fn conv_params<'a>(params: &'a [Value<'a>]) -> crate::Result for Error { tiberius::error::Error::Server(e) if e.code() == 547 => { let index = e .message() - .split('.').next() + .split('.') + .next() .unwrap() .split_whitespace() .last() diff --git a/src/connector/mysql/conversion.rs b/src/connector/mysql/conversion.rs index 682f125ab..d6c79db52 100644 --- a/src/connector/mysql/conversion.rs +++ b/src/connector/mysql/conversion.rs @@ -11,7 +11,7 @@ use mysql_async::{ }; use std::convert::TryFrom; -pub fn conv_params<'a>(params: &[Value<'a>]) -> crate::Result { +pub fn conv_params(params: &[Value<'_>]) -> crate::Result { if params.is_empty() { // If we don't use explicit 'Empty', // mysql crashes with 'internal error: entered unreachable code' @@ -63,7 +63,7 @@ pub fn conv_params<'a>(params: &[Value<'a>]) -> crate::Result { let mut builder = Error::builder(kind); builder.set_original_message(msg); - return Err(builder.build()) + return Err(builder.build()); } #[cfg(feature = "uuid-0_8")] Value::Uuid(u) => u.map(|u| my::Value::Bytes(u.to_hyphenated().to_string().into_bytes())), @@ -276,12 +276,12 @@ impl TakeRow for my::Row { my::Value::Time(is_neg, days, hours, minutes, seconds, micros) => { if is_neg { let kind = ErrorKind::conversion("Failed to convert a negative time"); - return Err(Error::builder(kind).build()) + return Err(Error::builder(kind).build()); } if days != 0 { let kind = ErrorKind::conversion("Failed to read a MySQL `time` as duration"); - return Err(Error::builder(kind).build()) + return Err(Error::builder(kind).build()); } let time = NaiveTime::from_hms_micro(hours.into(), minutes.into(), seconds.into(), micros); @@ -310,7 +310,7 @@ impl TakeRow for my::Row { ); let kind = ErrorKind::conversion(msg); - return Err(Error::builder(kind).build()) + return Err(Error::builder(kind).build()); } }, #[cfg(not(feature = "chrono-0_4"))] diff --git a/src/connector/postgres/conversion.rs b/src/connector/postgres/conversion.rs index 47944b0c3..e88a05111 100644 --- a/src/connector/postgres/conversion.rs +++ b/src/connector/postgres/conversion.rs @@ -648,7 +648,7 @@ fn string_to_bits(s: &str) -> crate::Result { let msg = "Unexpected character for bits input. Expected only 1 and 0."; let kind = ErrorKind::conversion(msg); - return Err(Error::builder(kind).build()) + return Err(Error::builder(kind).build()); } } } diff --git a/src/connector/sqlite/conversion.rs b/src/connector/sqlite/conversion.rs index 58058037e..84e625fdc 100644 --- a/src/connector/sqlite/conversion.rs +++ b/src/connector/sqlite/conversion.rs @@ -118,7 +118,7 @@ impl<'a> GetRow for SqliteRow<'a> { let msg = format!("Value {} not supported", n); let kind = ErrorKind::conversion(msg); - return Err(Error::builder(kind).build()) + return Err(Error::builder(kind).build()); } None => Value::Integer(None), }, @@ -212,7 +212,7 @@ impl<'a> ToSql for Value<'a> { let mut builder = Error::builder(kind); builder.set_original_message(msg); - return Err(RusqlError::ToSqlConversionFailure(Box::new(builder.build()))) + return Err(RusqlError::ToSqlConversionFailure(Box::new(builder.build()))); } #[cfg(feature = "json-1")] Value::Json(value) => value.as_ref().map(|value| { diff --git a/src/visitor/mssql.rs b/src/visitor/mssql.rs index 4cdf42104..d20c471dd 100644 --- a/src/visitor/mssql.rs +++ b/src/visitor/mssql.rs @@ -192,7 +192,7 @@ impl<'a> Visitor<'a> for Mssql<'a> { let mut builder = Error::builder(kind); builder.set_original_message(msg); - return Err(builder.build()) + return Err(builder.build()); } #[cfg(feature = "uuid-0_8")] Value::Uuid(uuid) => uuid.map(|uuid| { diff --git a/src/visitor/mysql.rs b/src/visitor/mysql.rs index 658a45e56..4ca051dd3 100644 --- a/src/visitor/mysql.rs +++ b/src/visitor/mysql.rs @@ -80,7 +80,7 @@ impl<'a> Visitor<'a> for Mysql<'a> { let mut builder = Error::builder(kind); builder.set_original_message(msg); - return Err(builder.build()) + return Err(builder.build()); } #[cfg(feature = "uuid-0_8")] Value::Uuid(uuid) => uuid.map(|uuid| self.write(format!("'{}'", uuid.to_hyphenated().to_string()))), diff --git a/src/visitor/sqlite.rs b/src/visitor/sqlite.rs index 7da53d8cf..3a58ccddf 100644 --- a/src/visitor/sqlite.rs +++ b/src/visitor/sqlite.rs @@ -64,7 +64,7 @@ impl<'a> Visitor<'a> for Sqlite<'a> { let mut builder = Error::builder(kind); builder.set_original_message(msg); - return Err(builder.build()) + return Err(builder.build()); } #[cfg(feature = "uuid-0_8")] Value::Uuid(uuid) => uuid.map(|uuid| self.write(format!("'{}'", uuid.to_hyphenated().to_string()))),