Appease clippy

Various fixups to satisfy clippy.

Author: wfchandler

cargo-dist/src/backend/installer/macpkg.rs

@@ -52,12 +52,12 @@ impl PkgInstallerInfo {
         info!("Copying executables");
         for exe in &self.artifact.executables {
             info!("{} => {:?}", &self.package_dir.join(exe), bindir.join(exe));
-            LocalAsset::copy_file_to_file(&self.package_dir.join(exe), bindir.join(exe))?;
+            LocalAsset::copy_file_to_file(self.package_dir.join(exe), bindir.join(exe))?;
         }
         #[cfg(unix)]
         for (bin, targets) in &self.bin_aliases {
             for target in targets {
-                std::os::unix::fs::symlink(&bindir.join(bin), &bindir.join(target))?;
+                std::os::unix::fs::symlink(bindir.join(bin), bindir.join(target))?;
             }
         }
         for lib in self
@@ -66,7 +66,7 @@ impl PkgInstallerInfo {
             .iter()
             .chain(self.artifact.cstaticlibs.iter())
         {
-            LocalAsset::copy_file_to_file(&self.package_dir.join(lib), libdir.join(lib))?;
+            LocalAsset::copy_file_to_file(self.package_dir.join(lib), libdir.join(lib))?;
         }
 
         // The path the two pkg files get placed in while building

cargo-dist/src/env.rs

@@ -86,7 +86,7 @@ fn formulas_from_env(environment: &SortedMap<&str, &str>) -> Vec<(String, String
             for dep in formulastring.split(',') {
                 // Unwrap here is safe because `split` will always return
                 // a collection of at least one item.
-                let short_name = dep.split('/').last().unwrap();
+                let short_name = dep.split('/').next_back().unwrap();
                 let pkg_opt = format!("{opt_prefix}/{short_name}");
                 packages.push((dep.to_owned(), pkg_opt));
             }

cargo-dist/src/linkage.rs

@@ -482,7 +482,7 @@ fn determine_linux_build_environment() -> DistResult<BuildEnvironment> {
         // ldd (GNU libc) 2.39 (Fedora)
         first_line
             .split(' ')
-            .last()
+            .next_back()
             .and_then(|s| s.split_once('.').map(glibc_from_tuple))
             .transpose()?
     };

cargo-dist/src/migrate/mod.rs

@@ -148,7 +148,7 @@ fn do_migrate_from_dist_toml() -> DistResult<()> {
             // Try to keep existing comments if we can
             if let Some(desc) = decor.prefix().and_then(|p| p.as_str()) {
                 if !desc.starts_with('\n') {
-                    decor.set_prefix(&format!("\n{desc}"));
+                    decor.set_prefix(format!("\n{desc}"));
                 }
             } else {
                 decor.set_prefix("\n");

cargo-dist/src/sign/macos.rs

@@ -5,6 +5,7 @@
 //! 2) Apple expects certificates to be located in the Keychain,
 //!    a Mac-specific certificate store, which interacts a bit
 //!    weirdly with our ephemeral runner setup in CI.
+//!
 //! Most of this module is actually concerned with ephemeral
 //! keychain setup, with the signing section of the code relatively
 //! short in comparison. The keychain code will be reused elsewhere

vendor/axoasset/examples/compress.rs

@@ -28,6 +28,7 @@ fn main() {
     doit(args).unwrap()
 }
 
+#[allow(clippy::result_large_err)]
 fn doit(args: Cli) -> Result<(), AxoassetError> {
     #[cfg(feature = "compression-tar")]
     if args.dest_path.as_str().ends_with("tar.zstd") {

vendor/axoasset/tests/source.rs

@@ -174,7 +174,7 @@ goodbye = true
     // Get the span for a non-substring (string literal isn't pointing into the String)
     let val = source.deserialize_toml_edit().unwrap();
     assert_eq!(val["hello"].as_str().unwrap(), "there");
-    assert_eq!(val["goodbye"].as_bool().unwrap(), true);
+    assert!(val["goodbye"].as_bool().unwrap());
 }
 
 #[cfg(feature = "toml-edit")]
@@ -219,7 +219,7 @@ goodbye: true
 
     let res = source.deserialize_yaml::<MyType>().unwrap();
     assert_eq!(res.hello, "there");
-    assert_eq!(res.goodbye, true);
+    assert!(res.goodbye);
 }
 
 #[test]

vendor/axocli/examples/axoapp.rs

@@ -40,7 +40,7 @@ fn run(app: &axocli::CliApp<CliArgs>) -> Result<(), Report> {
         "i have no exclamation marks but i must scream"
     );
     if app.config.exclaim_count < 3 {
-        return Err(AxoAppError::NotExcitedEnough)?;
+        Err(AxoAppError::NotExcitedEnough)?;
     }
     let message = "hello axoapp";