From 5fe1fd022737484d6e7856a62dda8dbc951c12c1 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Fri, 23 Sep 2022 08:41:40 +0100
Subject: [PATCH] Fix linting warnings

---
 lib/src/fnc/script/from.rs |  8 ++++----
 lib/src/sql/value/put.rs   | 27 +++++++++++++++------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/src/fnc/script/from.rs b/lib/src/fnc/script/from.rs
index 073d5a7c4ad..c1d69a6d593 100644
--- a/lib/src/fnc/script/from.rs
+++ b/lib/src/fnc/script/from.rs
@@ -38,21 +38,21 @@ impl<'js> FromJs<'js> for Value {
 				// Extract the value as an object
 				let v = val.into_object().unwrap();
 				// Check to see if this object is a duration
-				if (&v).instance_of::<classes::duration::duration::Duration>() {
+				if (v).instance_of::<classes::duration::duration::Duration>() {
 					let v = v.into_instance::<classes::duration::duration::Duration>().unwrap();
 					let v: &classes::duration::duration::Duration = v.as_ref();
 					let v = v.value.clone();
 					return Ok(Duration::from(v).into());
 				}
 				// Check to see if this object is a record
-				if (&v).instance_of::<classes::record::record::Record>() {
+				if (v).instance_of::<classes::record::record::Record>() {
 					let v = v.into_instance::<classes::record::record::Record>().unwrap();
 					let v: &classes::record::record::Record = v.as_ref();
 					let v = (v.tb.clone(), v.id.clone());
 					return Ok(Thing::from(v).into());
 				}
 				// Check to see if this object is a uuid
-				if (&v).instance_of::<classes::uuid::uuid::Uuid>() {
+				if (v).instance_of::<classes::uuid::uuid::Uuid>() {
 					let v = v.into_instance::<classes::uuid::uuid::Uuid>().unwrap();
 					let v: &classes::uuid::uuid::Uuid = v.as_ref();
 					let v = v.value.clone();
@@ -60,7 +60,7 @@ impl<'js> FromJs<'js> for Value {
 				}
 				// Check to see if this object is a date
 				let date: js::Object = ctx.globals().get("Date")?;
-				if (&v).is_instance_of(&date) {
+				if (v).is_instance_of(&date) {
 					let f: js::Function = v.get("getTime")?;
 					let m: i64 = f.call((js::This(v),))?;
 					let d = Utc.timestamp_millis(m);
diff --git a/lib/src/sql/value/put.rs b/lib/src/sql/value/put.rs
index 52dd400abfb..b110d5b52ae 100644
--- a/lib/src/sql/value/put.rs
+++ b/lib/src/sql/value/put.rs
@@ -41,18 +41,21 @@ impl Value {
 						let path = path.next();
 						v.iter_mut().for_each(|v| v.put(path, val.clone()));
 					}
-					Part::First => match v.first_mut() {
-						Some(v) => v.put(path.next(), val),
-						None => (),
-					},
-					Part::Last => match v.last_mut() {
-						Some(v) => v.put(path.next(), val),
-						None => (),
-					},
-					Part::Index(i) => match v.get_mut(i.to_usize()) {
-						Some(v) => v.put(path.next(), val),
-						None => (),
-					},
+					Part::First => {
+						if let Some(v) = v.first_mut() {
+							v.put(path.next(), val)
+						}
+					}
+					Part::Last => {
+						if let Some(v) = v.last_mut() {
+							v.put(path.next(), val)
+						}
+					}
+					Part::Index(i) => {
+						if let Some(v) = v.get_mut(i.to_usize()) {
+							v.put(path.next(), val)
+						}
+					}
 					_ => {
 						v.iter_mut().for_each(|v| v.put(path, val.clone()));
 					}