Merge pull request #540 from theseus-rs/correct-lints

chore: correct lint errors

Author: brianheineman

ristretto_vm/src/build/intrinsics.rs

@@ -273,6 +273,7 @@ fn write_intrinsic_method_map(
         map_builder.entry(signature, function);
     }
     writeln!(file)?;
+    writeln!(file, "#[deny(clippy::large_stack_arrays)]")?;
     writeln!(file, "#[expect(clippy::unreadable_literal)]")?;
     let intrinsic_method_signature = "IntrinsicMethod";
     writeln!(

ristretto_vm/src/call_site_cache.rs

@@ -127,23 +127,22 @@ impl CallSiteCache {
         );
 
         // Update cache based on result
-        match &result {
-            Ok(value) => {
-                // Store successful resolution
-                let mut map = self.states.write().map_err(|error| {
-                    PoisonedLock(format!("Failed to acquire cache lock: {error}"))
-                })?;
-                debug!("CallSiteCache: Caching successful result for key: {key:?}",);
-                map.insert(key, CallSiteState::Resolved(value.clone()));
-            }
-            Err(_) => {
-                // Remove in-progress marker on failure to allow retry
-                let mut map = self.states.write().map_err(|error| {
-                    PoisonedLock(format!("Failed to acquire cache lock: {error}"))
-                })?;
-                debug!("CallSiteCache: Removing failed resolution from cache for key: {key:?}");
-                map.remove(&key);
-            }
+        if let Ok(value) = &result {
+            // Store successful resolution
+            let mut map = self
+                .states
+                .write()
+                .map_err(|error| PoisonedLock(format!("Failed to acquire cache lock: {error}")))?;
+            debug!("CallSiteCache: Caching successful result for key: {key:?}",);
+            map.insert(key, CallSiteState::Resolved(value.clone()));
+        } else {
+            // Remove in-progress marker on failure to allow retry
+            let mut map = self
+                .states
+                .write()
+                .map_err(|error| PoisonedLock(format!("Failed to acquire cache lock: {error}")))?;
+            debug!("CallSiteCache: Removing failed resolution from cache for key: {key:?}");
+            map.remove(&key);
         }
 
         result

ristretto_vm/src/instruction/invokeinterface.rs

@@ -68,7 +68,7 @@ pub(crate) async fn invokeinterface(
 
     // Find the method implementation
     let (resolved_class, resolved_method) =
-        resolve_method(object_class, method_name, method_descriptor)?;
+        resolve_method(&object_class, method_name, method_descriptor)?;
 
     // Check resolved method accessibility
     if !resolved_method.is_public() {

ristretto_vm/src/instruction/invokespecial.rs

@@ -32,8 +32,7 @@ pub(crate) async fn invokespecial(
         constant_pool.try_get_name_and_type(*name_and_type_index)?;
     let method_name = constant_pool.try_get_utf8(*name_index)?;
     let method_descriptor = constant_pool.try_get_utf8(*descriptor_index)?;
-    let (resolved_class, resolved_method) =
-        resolve_method(class.clone(), method_name, method_descriptor)?;
+    let (resolved_class, resolved_method) = resolve_method(&class, method_name, method_descriptor)?;
 
     let parameters = stack.drain_last(resolved_method.parameters().len() + 1);
     let result = thread

ristretto_vm/src/instruction/invokevirtual.rs

@@ -23,7 +23,7 @@ pub(crate) async fn invokevirtual(
         constant_pool.try_get_name_and_type(*name_and_type_index)?;
     let method_name = constant_pool.try_get_utf8(*name_index)?;
     let method_descriptor = constant_pool.try_get_utf8(*descriptor_index)?;
-    let (resolved_class, resolved_method) = resolve_method(class, method_name, method_descriptor)?;
+    let (resolved_class, resolved_method) = resolve_method(&class, method_name, method_descriptor)?;
 
     let parameters = stack.drain_last(resolved_method.parameters().len() + 1);
     let reference = match parameters.first() {
@@ -39,7 +39,7 @@ pub(crate) async fn invokevirtual(
     } else {
         let class_name = reference.class_name()?;
         let object_class = thread.class(class_name).await?;
-        resolve_method(object_class, method_name, method_descriptor)?
+        resolve_method(&object_class, method_name, method_descriptor)?
     };
 
     let result = thread.execute(&class, &method, &parameters).await?;
@@ -55,7 +55,7 @@ pub(crate) async fn invokevirtual(
 ///
 /// if the method is not found.
 pub(crate) fn resolve_method(
-    class: Arc<Class>,
+    class: &Arc<Class>,
     name: &str,
     descriptor: &str,
 ) -> Result<(Arc<Class>, Arc<Method>)> {

ristretto_vm/src/intrinsic_methods/intrinsics.rs

@@ -1,6 +1,7 @@
 //! This file is automatically generated by build.rs. Do not edit manually.
 use crate::intrinsic_methods::IntrinsicMethod;
 
+#[deny(clippy::large_stack_arrays)]
 #[expect(clippy::unreadable_literal)]
 pub(crate) static JAVA_8: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     key: 16287231350648472473,
@@ -1983,6 +1984,7 @@ pub(crate) static JAVA_8: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     ],
 };
 
+#[deny(clippy::large_stack_arrays)]
 #[expect(clippy::unreadable_literal)]
 pub(crate) static JAVA_11: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     key: 16287231350648472473,
@@ -3983,6 +3985,7 @@ pub(crate) static JAVA_11: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map
     ],
 };
 
+#[deny(clippy::large_stack_arrays)]
 #[expect(clippy::unreadable_literal)]
 pub(crate) static JAVA_17: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     key: 16287231350648472473,
@@ -6072,6 +6075,7 @@ pub(crate) static JAVA_17: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map
     ],
 };
 
+#[deny(clippy::large_stack_arrays)]
 #[expect(clippy::unreadable_literal)]
 pub(crate) static JAVA_21: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     key: 16287231350648472473,
@@ -8150,6 +8154,7 @@ pub(crate) static JAVA_21: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map
     ],
 };
 
+#[deny(clippy::large_stack_arrays)]
 #[expect(clippy::unreadable_literal)]
 pub(crate) static JAVA_24: phf::Map<&'static str, IntrinsicMethod> = ::phf::Map {
     key: 16287231350648472473,

ristretto_vm/src/intrinsic_methods/java/io/randomaccessfile.rs

@@ -141,6 +141,7 @@ pub(crate) async fn length_0(
 
 #[intrinsic_method("java/io/RandomAccessFile.open0(Ljava/lang/String;I)V", Any)]
 #[async_recursion(?Send)]
+#[expect(clippy::too_many_lines)]
 pub(crate) async fn open_0(
     thread: Arc<Thread>,
     mut parameters: Parameters,

ristretto_vm/src/intrinsic_methods/java/lang/class.rs

@@ -1282,7 +1282,7 @@ mod tests {
         };
         assert_eq!(class.name(), "[Ljava/lang/reflect/Field;");
         let mut signatures = Vec::new();
-        for reference in references.into_iter() {
+        for reference in references {
             let value = Value::from(reference);
             let result = vm
                 .invoke(
@@ -1333,7 +1333,7 @@ mod tests {
         };
         assert_eq!(class.name(), "[Ljava/lang/reflect/Method;");
         let mut method_names = Vec::new();
-        for reference in references.into_iter() {
+        for reference in references {
             let value = Value::from(reference);
             let result = vm
                 .invoke(

ristretto_vm/src/intrinsic_methods/java/lang/invoke/methodhandlenatives.rs

@@ -200,6 +200,7 @@ pub(crate) async fn register_natives(
     Ok(None)
 }
 
+#[expect(clippy::too_many_lines)]
 pub(crate) async fn resolve(
     thread: Arc<Thread>,
     member_self: Value,

ristretto_vm/src/intrinsic_methods/java/lang/reflect/array.rs

@@ -10,7 +10,7 @@ use ristretto_classloader::{Reference, Value};
 use ristretto_macros::intrinsic_method;
 use std::sync::Arc;
 
-fn get_class_name(value: Value) -> Result<String> {
+fn get_class_name(value: &Value) -> Result<String> {
     let component_type = value.as_object_ref()?;
     let class_name = component_type.value("name")?.as_string()?;
     Ok(class_name)
@@ -457,7 +457,7 @@ pub(crate) async fn new_array(
     mut parameters: Parameters,
 ) -> Result<Option<Value>> {
     let length = usize::try_from(parameters.pop_int()?)?;
-    let class_name = get_class_name(parameters.pop()?)?;
+    let class_name = get_class_name(&parameters.pop()?)?;
 
     let array = match class_name.as_str() {
         "boolean" | "byte" => Value::from(vec![0i8; length]),