From 4bc8cec195fea0f549616130b56dcf305a87cd16 Mon Sep 17 00:00:00 2001
From: Jeff Charles <jeff.charles@shopify.com>
Date: Wed, 4 Dec 2024 10:11:41 -0500
Subject: [PATCH] Fix tests and lints for new version of Rust

---
 crates/cli/src/codegen/mod.rs        |  6 ++++++
 crates/cli/tests/integration_test.rs |  2 +-
 crates/javy/src/serde/de.rs          |  6 +++---
 crates/javy/src/serde/ser.rs         | 16 ++++++++--------
 crates/plugin-api/src/lib.rs         |  4 ++++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/crates/cli/src/codegen/mod.rs b/crates/cli/src/codegen/mod.rs
index d742b060..11d96398 100644
--- a/crates/cli/src/codegen/mod.rs
+++ b/crates/cli/src/codegen/mod.rs
@@ -33,6 +33,12 @@
 //! as well as ensuring that any features available in the plugin match the
 //! features requsted by the JavaScript bytecode.
 
+// Wizer doesn't provide a good API to set a custom WASI context so we put our
+// WASI context in a static global variable and instruct the closure for
+// getting the WASI context to use a mutable reference to it. There are never
+// concurrent mutable references to the static WASI context so this is safe.
+#![allow(static_mut_refs)]
+
 mod builder;
 use std::{fs, rc::Rc, sync::OnceLock};
 
diff --git a/crates/cli/tests/integration_test.rs b/crates/cli/tests/integration_test.rs
index 4bb70400..5dcddac4 100644
--- a/crates/cli/tests/integration_test.rs
+++ b/crates/cli/tests/integration_test.rs
@@ -115,7 +115,7 @@ fn test_logging_with_redirect(builder: &mut Builder) -> Result<()> {
         "hello world from console.log\nhello world from console.error\n",
         logs.as_str(),
     );
-    assert_fuel_consumed_within_threshold(36_042, fuel_consumed);
+    assert_fuel_consumed_within_threshold(35_007, fuel_consumed);
     Ok(())
 }
 
diff --git a/crates/javy/src/serde/de.rs b/crates/javy/src/serde/de.rs
index 1e51831a..e182c141 100644
--- a/crates/javy/src/serde/de.rs
+++ b/crates/javy/src/serde/de.rs
@@ -123,7 +123,7 @@ impl<'js> Deserializer<'js> {
     }
 }
 
-impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
+impl<'de> de::Deserializer<'de> for &mut Deserializer<'de> {
     type Error = Error;
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
@@ -307,7 +307,7 @@ impl<'a, 'de> MapAccess<'a, 'de> {
     }
 }
 
-impl<'a, 'de> de::MapAccess<'de> for MapAccess<'a, 'de> {
+impl<'de> de::MapAccess<'de> for MapAccess<'_, 'de> {
     type Error = Error;
 
     fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
@@ -422,7 +422,7 @@ impl<'a, 'de: 'a> SeqAccess<'a, 'de> {
     }
 }
 
-impl<'a, 'de> de::SeqAccess<'de> for SeqAccess<'a, 'de> {
+impl<'de> de::SeqAccess<'de> for SeqAccess<'_, 'de> {
     type Error = Error;
 
     fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
diff --git a/crates/javy/src/serde/ser.rs b/crates/javy/src/serde/ser.rs
index 3b6e06fb..cb586b77 100644
--- a/crates/javy/src/serde/ser.rs
+++ b/crates/javy/src/serde/ser.rs
@@ -36,7 +36,7 @@ impl<'js> Serializer<'js> {
     }
 }
 
-impl<'a> ser::Serializer for &'a mut Serializer<'_> {
+impl ser::Serializer for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -219,7 +219,7 @@ impl<'a> ser::Serializer for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeSeq for &'a mut Serializer<'_> {
+impl ser::SerializeSeq for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -243,7 +243,7 @@ impl<'a> ser::SerializeSeq for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeTuple for &'a mut Serializer<'_> {
+impl ser::SerializeTuple for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -268,7 +268,7 @@ impl<'a> ser::SerializeTuple for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeTupleStruct for &'a mut Serializer<'_> {
+impl ser::SerializeTupleStruct for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -292,7 +292,7 @@ impl<'a> ser::SerializeTupleStruct for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeTupleVariant for &'a mut Serializer<'_> {
+impl ser::SerializeTupleVariant for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -317,7 +317,7 @@ impl<'a> ser::SerializeTupleVariant for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeMap for &'a mut Serializer<'_> {
+impl ser::SerializeMap for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -354,7 +354,7 @@ impl<'a> ser::SerializeMap for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeStruct for &'a mut Serializer<'_> {
+impl ser::SerializeStruct for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -379,7 +379,7 @@ impl<'a> ser::SerializeStruct for &'a mut Serializer<'_> {
     }
 }
 
-impl<'a> ser::SerializeStructVariant for &'a mut Serializer<'_> {
+impl ser::SerializeStructVariant for &mut Serializer<'_> {
     type Ok = ();
     type Error = Error;
 
diff --git a/crates/plugin-api/src/lib.rs b/crates/plugin-api/src/lib.rs
index b9f72264..3f4548b9 100644
--- a/crates/plugin-api/src/lib.rs
+++ b/crates/plugin-api/src/lib.rs
@@ -33,6 +33,10 @@
 //! # Features
 //! * `json` - enables the `json` feature in the `javy` crate.
 
+// Allow these in this file because we only run this program single threaded
+// and we can safely reason about the accesses to the Javy Runtime. We also
+// don't want to introduce overhead from taking unnecessary mutex locks.
+#![allow(static_mut_refs)]
 use anyhow::{anyhow, bail, Error, Result};
 pub use config::Config;
 use javy::quickjs::{self, Ctx, Error as JSError, Function, Module, Value};