chore: clippy

Author: lucasfernog

build.rs

@@ -33,16 +33,10 @@ fn main() {
         Ok(output) => {
             let msg = String::from_utf8_lossy(&output.stdout).to_string();
             if let Err(err) = std::fs::write(install_dir.join("commit"), msg) {
-                println!(
-                    "cargo:warning=failed to write current commit message: {}",
-                    err
-                )
+                println!("cargo:warning=failed to write current commit message: {err}")
             }
         }
-        Err(err) => println!(
-            "cargo:warning=failed to get current commit message: {}",
-            err
-        ),
+        Err(err) => println!("cargo:warning=failed to get current commit message: {err}"),
     }
 
     // Copy templates

src/android/adb/device_list.rs

@@ -90,7 +90,7 @@ mod test {
     )]
     fn test_adb_output_regex(input: &str, devices: Vec<&'static str>) {
         let regex = regex_multi_line!(ADB_DEVICE_REGEX);
-        println!("{}", input);
+        println!("{input}");
         let captures = regex
             .captures_iter(input)
             .map(|x| x.get(1).unwrap().as_str())

src/android/cli.rs

@@ -151,8 +151,7 @@ impl Reportable for Error {
             Self::ProjectDirAbsent { project_dir } => Report::action_request(
                 "Please run `cargo mobile init` and try again!",
                 format!(
-                    "Android Studio project directory {:?} doesn't exist.",
-                    project_dir
+                    "Android Studio project directory {project_dir:?} doesn't exist."
                 ),
             ),
             Self::OpenFailed(err) => Report::error("Failed to open project in Android Studio", err),

src/android/config.rs

@@ -145,20 +145,15 @@ impl Display for ProjectDirInvalid {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::NormalizationFailed { project_dir, cause } => {
-                write!(f, "{:?} couldn't be normalized: {}", project_dir, cause)
+                write!(f, "{project_dir:?} couldn't be normalized: {cause}")
             }
             Self::OutsideOfAppRoot {
                 project_dir,
                 root_dir,
-            } => write!(
-                f,
-                "{:?} is outside of the app root {:?}",
-                project_dir, root_dir,
-            ),
+            } => write!(f, "{project_dir:?} is outside of the app root {root_dir:?}",),
             Self::ContainsSpaces { project_dir } => write!(
                 f,
-                "{:?} contains spaces, which the NDK is remarkably intolerant of",
-                project_dir
+                "{project_dir:?} contains spaces, which the NDK is remarkably intolerant of"
             ),
         }
     }

src/android/jnilibs.rs

@@ -33,17 +33,16 @@ impl Reportable for RemoveBrokenLinksError {
     fn report(&self) -> Report {
         match self {
             Self::ReadDir { dir, source } => Report::error(
-                format!("Failed to list contents of jniLibs directory {:?}", dir),
+                format!("Failed to list contents of jniLibs directory {dir:?}"),
                 source,
             ),
             Self::Entry { dir, source } => Report::error(
-                format!("Failed to get entry in jniLibs directory {:?}", dir),
-                source,
-            ),
-            Self::Remove { path, source } => Report::error(
-                format!("Failed to remove broken symlink {:?}", path),
+                format!("Failed to get entry in jniLibs directory {dir:?}"),
                 source,
             ),
+            Self::Remove { path, source } => {
+                Report::error(format!("Failed to remove broken symlink {path:?}"), source)
+            }
         }
     }
 }

src/android/project.rs

@@ -61,14 +61,14 @@ impl Reportable for Error {
                 Report::error("Android template processing failed", err)
             }
             Self::DirectoryCreationFailed { path, cause } => Report::error(
-                format!("Failed to create Android assets directory at {:?}", path),
+                format!("Failed to create Android assets directory at {path:?}"),
                 cause,
             ),
             Self::DirectoryReadFailed { path, cause } => {
-                Report::error(format!("Failed to read directory at {:?}", path), cause)
+                Report::error(format!("Failed to read directory at {path:?}"), cause)
             }
             Self::DirectoryRemoveFailed { path, cause } => Report::error(
-                format!("Failed to remove directory directory at {:?}", path),
+                format!("Failed to remove directory directory at {path:?}"),
                 cause,
             ),
             Self::AssetDirSymlinkFailed(err) => {
@@ -77,12 +77,11 @@ impl Reportable for Error {
             Self::DotCargoGenFailed(err) => {
                 Report::error("Failed to generate Android cargo config", err)
             }
-            Self::FileCopyFailed { src, dest, cause } => Report::error(
-                format!("Failed to copy file at {:?} to {:?}", src, dest),
-                cause,
-            ),
+            Self::FileCopyFailed { src, dest, cause } => {
+                Report::error(format!("Failed to copy file at {src:?} to {dest:?}"), cause)
+            }
             Self::AssetSourceInvalid(src) => Report::error(
-                format!("Asset source at {:?} invalid", src),
+                format!("Asset source at {src:?} invalid"),
                 "Asset sources must be either a directory or a file",
             ),
         }

src/android/source_props.rs

@@ -32,7 +32,7 @@ impl Display for Revision {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.triple)?;
         if let Some(beta) = self.beta {
-            write!(f, "-beta{}", beta)?;
+            write!(f, "-beta{beta}")?;
         }
         Ok(())
     }

src/apple/cli.rs

@@ -188,7 +188,7 @@ impl Reportable for Error {
             Self::Unsupported => Report::error("iOS is marked as unsupported in your Cargo.toml metadata", "If your project should support Android, modify your Cargo.toml, then run `cargo mobile init` and try again."),
             Self::ProjectDirAbsent { project_dir } => Report::action_request(
                 "Please run `cargo mobile init` and try again!",
-                format!("Xcode project directory {:?} doesn't exist.", project_dir),
+                format!("Xcode project directory {project_dir:?} doesn't exist."),
             ),
             Self::OpenFailed(err) => Report::error("Failed to open project in Xcode", err),
             Self::CheckFailed(err) => err.report(),
@@ -201,19 +201,19 @@ impl Reportable for Error {
             Self::CargoEnvFailed(err) => Report::error("Failed to load cargo env profile", err),
             Self::SdkRootInvalid { sdk_root } => Report::error(
                 "SDK root provided by Xcode was invalid",
-                format!("{:?} doesn't exist or isn't a directory", sdk_root),
+                format!("{sdk_root:?} doesn't exist or isn't a directory"),
             ),
             Self::IncludeDirInvalid { include_dir } => Report::error(
                 "Include dir was invalid",
-                format!("{:?} doesn't exist or isn't a directory", include_dir),
+                format!("{include_dir:?} doesn't exist or isn't a directory"),
             ),
             Self::MacosSdkRootInvalid { macos_sdk_root } => Report::error(
                 "macOS SDK root was invalid",
-                format!("{:?} doesn't exist or isn't a directory", macos_sdk_root),
+                format!("{macos_sdk_root:?} doesn't exist or isn't a directory"),
             ),
             Self::ArchInvalid { arch } => Report::error(
                 "Arch specified by Xcode was invalid",
-                format!("{:?} isn't a known arch", arch),
+                format!("{arch:?} isn't a known arch"),
             ),
             Self::CompileLibFailed(err) => err.report(),
             Self::PodCommandFailed(err) => Report::error("pod command failed", err),
@@ -484,9 +484,9 @@ impl Exec for Input {
                         "x86_64" => ("x86_64_apple_ios", "x86_64-apple-ios"),
                         _ => return Err(Error::ArchInvalid { arch }),
                     };
-                    let cflags = format!("CFLAGS_{}", triple);
-                    let cxxflags = format!("CFLAGS_{}", triple);
-                    let objc_include_path = format!("OBJC_INCLUDE_PATH_{}", triple);
+                    let cflags = format!("CFLAGS_{triple}");
+                    let cxxflags = format!("CFLAGS_{triple}");
+                    let objc_include_path = format!("OBJC_INCLUDE_PATH_{triple}");
                     let mut target_env = host_env.clone();
                     target_env.insert(cflags.as_ref(), isysroot.as_ref());
                     target_env.insert(cxxflags.as_ref(), isysroot.as_ref());
@@ -532,7 +532,7 @@ impl Exec for Input {
                     }
 
                     // Copy static lib .a to Xcode Project
-                    if rust_triple.starts_with(&"aarch64-apple-ios") {
+                    if rust_triple.starts_with("aarch64-apple-ios") {
                         std::fs::create_dir_all(format!(
                             "Sources/{rust_triple}/{}",
                             profile.as_str()

src/apple/config/mod.rs

@@ -194,16 +194,14 @@ impl Display for ProjectDirInvalid {
         match self {
             Self::NormalizationFailed { project_dir, cause } => write!(
                 f,
-                "Xcode project dir {:?} couldn't be normalized: {}",
-                project_dir, cause
+                "Xcode project dir {project_dir:?} couldn't be normalized: {cause}"
             ),
             Self::OutsideOfAppRoot {
                 project_dir,
                 root_dir,
             } => write!(
                 f,
-                "Xcode project dir {:?} is outside of the app root dir {:?}",
-                project_dir, root_dir,
+                "Xcode project dir {project_dir:?} is outside of the app root dir {root_dir:?}",
             ),
         }
     }
@@ -388,7 +386,7 @@ impl Config {
     }
 
     pub fn ipa_path(&self) -> Result<PathBuf, (PathBuf, PathBuf)> {
-        let path = |tail: &str| self.export_dir().join(format!("{}.ipa", tail));
+        let path = |tail: &str| self.export_dir().join(format!("{tail}.ipa"));
         let old = path(&self.scheme());
         // It seems like the format changed recently?
         let new = path(self.app.stylized_name());

src/apple/config/raw.rs

@@ -15,7 +15,7 @@ impl Display for DetectError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::DeveloperTeamLookupFailed(err) => {
-                write!(f, "Failed to find Apple developer teams: {}", err)
+                write!(f, "Failed to find Apple developer teams: {err}")
             }
         }
     }
@@ -31,10 +31,10 @@ impl Display for PromptError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::DeveloperTeamLookupFailed(err) => {
-                write!(f, "Failed to find Apple developer teams: {}", err)
+                write!(f, "Failed to find Apple developer teams: {err}")
             }
             Self::DeveloperTeamPromptFailed(err) => {
-                write!(f, "Failed to prompt for Apple developer team: {}", err)
+                write!(f, "Failed to prompt for Apple developer team: {err}")
             }
         }
     }
@@ -50,7 +50,7 @@ fn value_to_string(value: &PlistValue) -> String {
                 .map(value_to_string)
                 .collect::<Vec<_>>()
                 .join(",");
-            format!("[{}]", string)
+            format!("[{string}]")
         }
         PlistValue::Dictionary(dict) => dictionary_to_string(dict),
     }
@@ -67,7 +67,7 @@ fn dictionary_to_string(dict: &PlistDictionary) -> String {
         .map(|pair| pair_to_string(&pair.0.key, &pair.0.value))
         .collect::<Vec<_>>()
         .join(",");
-    format!("{{{}}}", joint)
+    format!("{{{joint}}}")
 }
 
 #[derive(Clone, Debug, Deserialize)]