From dc98e95ff3a59c267df7807ce9320d8b5a348b63 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 25 Sep 2023 12:24:16 -0700
Subject: [PATCH] refactor: quiet latest clippy warnings

---
 syncserver/src/web/middleware/sentry.rs | 2 +-
 syncstorage-db/src/tests/db.rs          | 2 +-
 syncstorage-mysql/src/models.rs         | 2 ++
 syncstorage-spanner/src/models.rs       | 3 +++
 tokenserver-db/src/models.rs            | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/syncserver/src/web/middleware/sentry.rs b/syncserver/src/web/middleware/sentry.rs
index 6fff74a1..424a8d63 100644
--- a/syncserver/src/web/middleware/sentry.rs
+++ b/syncserver/src/web/middleware/sentry.rs
@@ -22,7 +22,7 @@ pub fn report(
     extra: HashMap<String, String>,
     mut event: Event<'static>,
 ) {
-    event.tags.extend(tags.into_iter());
+    event.tags.extend(tags);
     event
         .extra
         .extend(extra.into_iter().map(|(k, v)| (k, Value::from(v))));
diff --git a/syncstorage-db/src/tests/db.rs b/syncstorage-db/src/tests/db.rs
index e1a00a84..4e479d09 100644
--- a/syncstorage-db/src/tests/db.rs
+++ b/syncstorage-db/src/tests/db.rs
@@ -866,7 +866,7 @@ async fn get_bsos() -> Result<(), DbError> {
 
     let uid = 2;
     let coll = "clients";
-    let sortindexes = vec![1, 3, 4, 2, 0];
+    let sortindexes = [1, 3, 4, 2, 0];
     for (i, (revi, sortindex)) in sortindexes.iter().enumerate().rev().enumerate() {
         let bso = pbso(
             uid,
diff --git a/syncstorage-mysql/src/models.rs b/syncstorage-mysql/src/models.rs
index a5cb255c..3ff2793a 100644
--- a/syncstorage-mysql/src/models.rs
+++ b/syncstorage-mysql/src/models.rs
@@ -130,6 +130,8 @@ impl MysqlDb {
             conn: LoggingConnection::new(conn),
             session: RefCell::new(Default::default()),
         };
+        // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+        #[allow(clippy::arc_with_non_send_sync)]
         MysqlDb {
             inner: Arc::new(inner),
             coll_cache,
diff --git a/syncstorage-spanner/src/models.rs b/syncstorage-spanner/src/models.rs
index fd7c73a8..fb56702d 100644
--- a/syncstorage-spanner/src/models.rs
+++ b/syncstorage-spanner/src/models.rs
@@ -113,6 +113,9 @@ impl SpannerDb {
             session: RefCell::new(Default::default()),
         };
         SpannerDb {
+            // We can probably move this to Rc:
+            // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+            #[allow(clippy::arc_with_non_send_sync)]
             inner: Arc::new(inner),
             coll_cache,
             metrics: metrics.clone(),
diff --git a/tokenserver-db/src/models.rs b/tokenserver-db/src/models.rs
index f1cc51de..e7832831 100644
--- a/tokenserver-db/src/models.rs
+++ b/tokenserver-db/src/models.rs
@@ -76,6 +76,8 @@ impl TokenserverDb {
             conn: LoggingConnection::new(conn),
         };
 
+        // https://github.com/mozilla-services/syncstorage-rs/issues/1480
+        #[allow(clippy::arc_with_non_send_sync)]
         Self {
             inner: Arc::new(inner),
             metrics: metrics.clone(),