Nightly clippy

Author: dlunch

java_runtime/src/classes/java/util/hashtable.rs

@@ -58,8 +58,8 @@ impl Hashtable {
 
         let vec = rust_hash_map.lock().get(&key_hash).cloned();
 
-        if vec.is_some() {
-            for (key, _) in &vec.unwrap() {
+        if let Some(x) = vec {
+            for (key, _) in &x {
                 let equals = jvm.invoke_virtual(key, "equals", "(Ljava/lang/Object;)Z", ((*key).clone(),)).await?;
                 if equals {
                     return Ok(true);
@@ -78,8 +78,8 @@ impl Hashtable {
 
         let vec = rust_hash_map.lock().get(&key_hash).cloned();
 
-        if vec.is_some() {
-            for (key, value) in &vec.unwrap() {
+        if let Some(x) = vec {
+            for (key, value) in &x {
                 let equals = jvm.invoke_virtual(key, "equals", "(Ljava/lang/Object;)Z", ((*key).clone(),)).await?;
                 if equals {
                     return Ok(value.clone().into());
@@ -104,8 +104,8 @@ impl Hashtable {
 
         let vec = rust_hash_map.lock().get(&key_hash).cloned();
 
-        if vec.is_some() {
-            for (i, (bucket_key, _)) in vec.unwrap().iter().enumerate() {
+        if let Some(x) = vec {
+            for (i, (bucket_key, _)) in x.iter().enumerate() {
                 let equals = jvm.invoke_virtual(bucket_key, "equals", "(Ljava/lang/Object;)Z", (key.clone(),)).await?;
                 if equals {
                     let (_, old_value) = rust_hash_map.lock().get_mut(&key_hash).unwrap().remove(i);

jvm/src/garbage_collector.rs

@@ -45,11 +45,10 @@ fn find_static_reachable_objects(jvm: &Jvm, class: &Class, reachable_objects: &m
         let descriptor = field.descriptor();
         let value = class.definition.get_static_field(&*field).unwrap();
 
-        if (descriptor.starts_with('L') && descriptor.ends_with(';')) || descriptor.starts_with('[') {
-            if let JavaValue::Object(Some(value)) = value {
+        if ((descriptor.starts_with('L') && descriptor.ends_with(';')) || descriptor.starts_with('['))
+            && let JavaValue::Object(Some(value)) = value {
                 find_reachable_objects(jvm, &value, reachable_objects);
             }
-        }
     }
 }
 

jvm/src/jvm.rs

@@ -606,14 +606,12 @@ impl Jvm {
     }
 
     async fn register_class_internal(&self, class: Class, class_loader_wrapper: Option<&dyn ClassLoaderWrapper>) -> Result<()> {
-        if !class.definition.name().starts_with('[') {
-            if let Some(super_class) = class.definition.super_class_name() {
-                if !self.has_class(&super_class) {
+        if !class.definition.name().starts_with('[')
+            && let Some(super_class) = class.definition.super_class_name()
+                && !self.has_class(&super_class) {
                     // ensure superclass is loaded
                     self.resolve_class_internal(&super_class, class_loader_wrapper).await?;
                 }
-            }
-        }
 
         self.inner.classes.write().insert(class.definition.name().to_owned(), class.clone());