Clippy

Author: dlunch

java_runtime/src/classes/java/io/print_stream.rs

@@ -151,7 +151,7 @@ impl PrintStream {
     async fn println_double(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>, double: f64) -> Result<()> {
         tracing::debug!("java.io.PrintStream::println({:?}, {:?})", &this, &double);
 
-        let string = format!("{:.1}", double);
+        let string = format!("{double:.1}");
 
         let java_string = JavaLangString::from_rust_string(jvm, &string).await?;
 

java_runtime/src/classes/java/lang/class_loader.rs

@@ -102,7 +102,7 @@ impl ClassLoader {
                 let mut urls = Vec::new();
                 for path in class_path.split(':') {
                     // TODO File.pathSeparator
-                    let path = JavaLangString::from_rust_string(jvm, &format!("file:{}", path)).await?;
+                    let path = JavaLangString::from_rust_string(jvm, &format!("file:{path}")).await?;
                     let url = jvm.new_class("java/net/URL", "(Ljava/lang/String;)V", (path,)).await?;
 
                     urls.push(url);

java_runtime/src/classes/java/lang/integer.rs

@@ -81,7 +81,7 @@ impl Integer {
     async fn to_hex_string(jvm: &Jvm, _: &mut RuntimeContext, value: i32) -> Result<ClassInstanceRef<String>> {
         tracing::debug!("java.lang.Integer::toHexString({:?})", value);
 
-        let string = JavaLangString::from_rust_string(jvm, &format!("{:x}", value)).await?;
+        let string = JavaLangString::from_rust_string(jvm, &format!("{value:x}")).await?;
 
         Ok(string.into())
     }

java_runtime/src/classes/java/lang/object.rs

@@ -94,7 +94,7 @@ impl Object {
 
         let hash_code: i32 = jvm.invoke_virtual(&this, "hashCode", "()I", ()).await?;
 
-        let result = format!("{}@{:x}", class_name_rust, hash_code);
+        let result = format!("{class_name_rust}@{hash_code:x}");
 
         Ok(JavaLangString::from_rust_string(jvm, &result).await?.into())
     }

java_runtime/src/classes/java/lang/throwable.rs

@@ -135,7 +135,7 @@ impl Throwable {
             if message.is_empty() {
                 class_name
             } else {
-                format!("{}: {}", class_name, message)
+                format!("{class_name}: {message}")
             }
         };
 
@@ -154,7 +154,7 @@ impl Throwable {
             .await?;
 
         for line in stack_trace.iter() {
-            let line = format!("\tat {}", line);
+            let line = format!("\tat {line}");
             let line = JavaLangString::from_rust_string(jvm, &line).await?;
             let _: () = jvm.invoke_virtual(&stream_or_writer, "println", "(Ljava/lang/String;)V", (line,)).await?;
         }

java_runtime/src/classes/java/net/url.rs

@@ -292,7 +292,7 @@ impl URL {
             Ok(jvm.new_class("org/rustjava/net/JarURLHandler", "()V", ()).await?.into())
         } else {
             Err(jvm
-                .exception("java/net/MalformedURLException", &format!("unknown protocol: {}", protocol))
+                .exception("java/net/MalformedURLException", &format!("unknown protocol: {protocol}"))
                 .await)
         }
     }

java_runtime/src/classes/java/net/url_class_loader.rs

@@ -132,7 +132,7 @@ impl URLClassLoader {
             if file.ends_with('/') || file.is_empty() {
                 // directory
                 let final_path = if file.ends_with('/') {
-                    format!("{}{}", file, name_str)
+                    format!("{file}{name_str}")
                 } else {
                     name_str.clone()
                 };
@@ -158,7 +158,7 @@ impl URLClassLoader {
                 // treat as jar
                 let name_str = name_str.trim_start_matches('/');
 
-                let jar_url_str = format!("jar:file:{}!/{}", file, name_str); // TODO url might not be file
+                let jar_url_str = format!("jar:file:{file}!/{name_str}"); // TODO url might not be file
                 let jar_url = JavaLangString::from_rust_string(jvm, &jar_url_str).await?;
                 let jar_url = jvm.new_class("java/net/URL", "(Ljava/lang/String;)V", (jar_url,)).await?;
                 let connection: ClassInstanceRef<JarURLConnection> =

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

@@ -208,7 +208,7 @@ impl Vector {
 
         if index as usize >= size {
             return Err(jvm
-                .exception("java/lang/IndexOutOfBoundsException", &format!("{} >= {}", index, size))
+                .exception("java/lang/IndexOutOfBoundsException", &format!("{index} >= {size}"))
                 .await);
         }
 

jvm/src/class_instance.rs

@@ -71,7 +71,7 @@ impl<T> ClassInstanceRef<T> {
 impl<T> Debug for ClassInstanceRef<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         if let Some(x) = &self.instance {
-            write!(f, "{:?}", x)
+            write!(f, "{x:?}")
         } else {
             write!(f, "null")
         }

jvm/src/error.rs

@@ -15,8 +15,8 @@ pub enum JavaError {
 impl Display for JavaError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            JavaError::JavaException(e) => write!(f, "Java exception: {:?}", e),
-            JavaError::FatalError(e) => write!(f, "Fatal error: {}", e),
+            JavaError::JavaException(e) => write!(f, "Java exception: {e:?}"),
+            JavaError::FatalError(e) => write!(f, "Fatal error: {e}"),
         }
     }
 }