From 70525c018dfd31a27805bb1fb666501b73d43e21 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Thu, 20 Feb 2025 21:37:33 -0500
Subject: Upgrade to Rust 1.85 and Rust 2024 edition.

There are a couple of migration suggestions from `cargo fix --edition` that I have deliberately skipped, which are intended to make sure that the changes to `if let` scoping don't bite us. They don't, I'm pretty sure, and if I turn out to be wrong, I'd rather fix the scoping issues (as they arise) than use `match` (`cargo fix --edition`'s suggestion).

This change also includes a bulk reformat and a clippy cleanup.

NOTA BENE: As this requires a new Rust toolchain, you'll need to update Rust (`rustup update`, normally) or the server won't build. This also applies to the Debian builder Docker image; it'll need to be rebuilt (from scratch, pulling its base image again) as well.
---
 src/normalize/string.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/normalize')

diff --git a/src/normalize/string.rs b/src/normalize/string.rs
index a0d178c..01bdd6b 100644
--- a/src/normalize/string.rs
+++ b/src/normalize/string.rs
@@ -1,8 +1,8 @@
 use std::{fmt, string::String as StdString};
 
 use sqlx::{
-    encode::{Encode, IsNull},
     Database, Decode, Type,
+    encode::{Encode, IsNull},
 };
 
 pub trait Normalize: Clone + Default {
-- 
cgit v1.2.3


From 14322855767838a17058ffe3776b0887a13e5fa6 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Fri, 21 Feb 2025 16:52:07 -0500
Subject: Reorder impl to match trait

---
 src/normalize/string.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/normalize')

diff --git a/src/normalize/string.rs b/src/normalize/string.rs
index 01bdd6b..ee33267 100644
--- a/src/normalize/string.rs
+++ b/src/normalize/string.rs
@@ -1,8 +1,8 @@
 use std::{fmt, string::String as StdString};
 
 use sqlx::{
-    Database, Decode, Type,
-    encode::{Encode, IsNull},
+    encode::{Encode, IsNull}, Database, Decode,
+    Type,
 };
 
 pub trait Normalize: Clone + Default {
@@ -84,20 +84,20 @@ where
     DB: Database,
     StdString: Encode<'q, DB>,
 {
-    fn encode_by_ref(
-        &self,
+    fn encode(
+        self,
         buf: &mut <DB as Database>::ArgumentBuffer<'q>,
     ) -> Result<IsNull, sqlx::error::BoxDynError> {
         let Self(value, _) = self;
-        value.encode_by_ref(buf)
+        value.encode(buf)
     }
 
-    fn encode(
-        self,
+    fn encode_by_ref(
+        &self,
         buf: &mut <DB as Database>::ArgumentBuffer<'q>,
     ) -> Result<IsNull, sqlx::error::BoxDynError> {
         let Self(value, _) = self;
-        value.encode(buf)
+        value.encode_by_ref(buf)
     }
 
     fn produces(&self) -> Option<<DB as Database>::TypeInfo> {
-- 
cgit v1.2.3